Skip to content

Support comma separated list of netmasks per zone #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support comma separated list of netmasks per zone #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions lib/MogileFS/ReplicationPolicy/MultipleNetworks.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,22 +213,25 @@ sub unique_hosts_and_networks {
my @zones = split(/\s*,\s*/,MogileFS::Config->server_setting("network_zones"));

foreach my $zone (@zones) {
my $netmask = MogileFS::Config->server_setting("zone_".$zone);
my $netmasks = MogileFS::Config->server_setting("zone_" . $zone);

if (not $netmask) {
warn "couldn't find network_zone <<zone_".$zone.">> check your server settings";
if (not $netmasks) {
warn "couldn't find network_zone <<zone_" . $zone
. ">> check your server settings";
next;
}

if ($cache{$netmask}) {
warn "duplicate netmask <$netmask> in network zones. check your server settings";
}
foreach my $netmask (split /\s*,\s*/, $netmasks) {
if ($cache{$netmask}) {
warn "duplicate netmask <$netmask> in network zones. check your server settings";
}

$cache{$netmask} = Net::Netmask->new2($netmask);
$cache{$netmask} = Net::Netmask->new2($netmask);

if (Net::Netmask::errstr()) {
warn "couldn't parse <$zone> as a netmask. error was <".Net::Netmask::errstr().
">. check your server settings";
if (Net::Netmask::errstr()) {
warn "couldn't parse <$zone> as a netmask. error was <"
. Net::Netmask::errstr() . ">. check your server settings";
}
}
}
}
Expand Down