X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/fe48c4c017023b98ad6f145c8cf35f9c5a39ba5d..305a05819502360eb874be0b0d4010ae11239497:/bin/mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index fca95b2..9ec063e 100755
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -12,14 +12,54 @@ use YAML;
 
 my $source = shift @ARGV;
 my $zone = shift @ARGV;
-my $servers = YAML::LoadFile("src/${source}");
+my $clusters = YAML::LoadFile("src/${source}");
+my @servers;
 
-# Initialise server details
-while (my($name,$server) = each %$servers)
+# Initialise cluster details
+while (my($name,$cluster) = each %$clusters)
 {
-    $server->{name} = $name;
-    $server->{bandwidth} = $server->{bandwidth} * 1024 * 1024;
+    if ($cluster->{servers})
+    {
+        $cluster->{bandwidth} = 0;
+
+        foreach my $server (@{$cluster->{servers}})
+        {
+            $server->{cluster} = $cluster;
+            $cluster->{bandwidth} = $cluster->{bandwidth} + $server->{bandwidth};
+
+            push @servers, $server;
+        }
+    }
+    else
+    {
+        my $server = {
+            cluster => $cluster,
+            pingdom => $cluster->{pingdom},
+            bandwidth => $cluster->{bandwidth},
+            ipv4 => $cluster->{ipv4},
+            ipv6 => $cluster->{ipv6}
+        };
+
+        $cluster->{servers} = [ $server ];
+
+        push @servers, $server;
+    }
+
+    $cluster->{name} = $name;
+
+    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
+    {
+        $cluster->{status} = "down";
+    }
+    else
+    {
+        $cluster->{status} = "up";
+    }
+}
 
+# Initialise server details
+foreach my $server (@servers)
+{
     if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
     {
         $server->{status} = "down";
@@ -38,7 +78,7 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
     $ua->default_header("App-Key", "2cohi62u5haxvqmypk3ljqqrze1jufrh");
     $ua->credentials("api.pingdom.com:443", "Pingdom API", $ENV{PINGDOM_USERNAME}, $ENV{PINGDOM_PASSWORD});
 
-    foreach my $server (values %$servers)
+    foreach my $server (@servers)
     {
         if (my $checkid = $server->{pingdom})
         {
@@ -49,11 +89,27 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
                 my $check = decode_json($response->content);
 
                 $server->{status} = $check->{check}->{status};
+
+                if ($server->{status} eq "up")
+                {
+                    $server->{cluster}->{status} = "up";
+                }
+                else
+                {
+                    $server->{cluster}->{bandwidth} = $server->{cluster}->{bandwidth} - $server->{bandwidth};
+                }
             }
         }
     }
 }
 
+# Initialise cluster details
+while (my($name,$cluster) = each %$clusters)
+{
+    $cluster->{bandwidth_limit} = $cluster->{bandwidth} * 1024 * 1024;
+    $cluster->{bandwidth_used} = 0;
+}
+
 my %countries = ();
 my @mappings = ();
 
@@ -66,7 +122,7 @@ $countries->parsefile("lib/countries.xml");
 # Load the per-country bandwidth details
 my $bandwidth = YAML::LoadFile("bandwidth/${source}.yml");
 
-# Fill in country table and work out which servers each can use
+# Fill in country table and work out which clusters each can use
 foreach my $country ($countries->look_down("_tag" => "country"))
 {
     my $code = $country->look_down("_tag" => "countryCode")->as_text;
@@ -86,17 +142,17 @@ foreach my $country ($countries->look_down("_tag" => "country"))
         bandwidth => $bandwidth, lat => $lat, lon => $lon
     };
 
-    foreach my $server (values %$servers)
+    foreach my $cluster (values %$clusters)
     {
-        my $match = match_country($server, $code, $continent);
+        my $match = match_country($cluster, $code, $continent);
 
-        if ($server->{status} eq "up" && $match ne "denied")
+        if ($cluster->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;
-            my $distance = distance($lat, $lon, $server->{lat}, $server->{lon});
+            my $distance = distance($lat, $lon, $cluster->{lat}, $cluster->{lon});
 
             push @mappings, {
-                country => $countries{$code}, server => $server,
+                country => $countries{$code}, cluster => $cluster,
                 priority => $priority, distance => $distance
             };
         }
@@ -106,28 +162,29 @@ foreach my $country ($countries->look_down("_tag" => "country"))
 # Discard the parsed country database
 $countries->delete;
 
-# Loop over the mappings, trying to assign each country to the
-# nearest server, but subject to the bandwidth limits;
-foreach my $mapping (sort {  $b->{priority} <=> $a->{priority} || $a->{distance} <=> $b->{distance} } @mappings)
-{
-    my $country = $mapping->{country};
-    my $server = $mapping->{server};
+# Allocate each country to a cluster
+allocate_clusters(\@mappings);
 
-    if ($country->{bandwidth} <= $server->{bandwidth} && !exists($country->{server}))
+# If we failed to allocate every country then loop, increasing
+# the bandwidth for each cluster by a little and retrying until
+# we manage to allocate everything
+while (grep { !exists($_->{cluster}) } values %countries)
+{
+    # Clear any existing mappings of countries to clusters
+    foreach my $country (values %countries)
     {
-        $country->{server} = $server;
-        $server->{bandwidth} = $server->{bandwidth} - $country->{bandwidth};
+        delete $country->{cluster};
     }
-}
 
-# Loop over the mappings again, assigning anything that is left
-# as best we can, and allowing bandwidth limits to be exeeded
-foreach my $mapping (sort {  $b->{priority} <=> $a->{priority} || $a->{distance} <=> $b->{distance} } @mappings)
-{
-    my $country = $mapping->{country};
-    my $server = $mapping->{server};
+    # Reset bandwidth usage for clusters and increase limits by 10%
+    foreach my $cluster (values %$clusters)
+    {
+        $cluster->{bandwidth_used} = 0;
+        $cluster->{bandwidth_limit} = $cluster->{bandwidth_limit} * 1.1;
+    }
 
-    $country->{server} = $server unless exists($country->{server});
+    # Try the allocate again
+    allocate_clusters(\@mappings);
 }
 
 # Create JSON collection object
@@ -140,11 +197,11 @@ my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 # Output details for each country
 foreach my $country (values %countries)
 {
-    my $server = $country->{server};
+    my $cluster = $country->{cluster};
     my $clon = $country->{lon};
     my $clat = $country->{lat};
-    my $slon = $server->{lon};
-    my $slat = $server->{lat};
+    my $slon = $cluster->{lon};
+    my $slat = $cluster->{lat};
 
     if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
     {
@@ -156,7 +213,7 @@ foreach my $country (values %countries)
     }
 
     $zonefile->print("# $country->{name}\n");
-    $zonefile->print("C\L$country->{code}\E.${zone}:$server->{name}.${zone}:600\n");
+    $zonefile->print("C\L$country->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
 
     push @json, {
         type => "Feature",
@@ -165,15 +222,37 @@ foreach my $country (values %countries)
             coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
         },
         properties => {
-            country => $country->{name}
+            country => $country->{name},
+            server => $cluster->{name},
+            colour => $cluster->{colour}
         }
     };
 }
 
 # Output default records for IPs that can't be mapped to a country
-foreach my $server (grep { $servers->{$_}->{default} } keys %$servers)
+foreach my $cluster (grep { $clusters->{$_}->{default} } keys %$clusters)
+{
+    $zonefile->print("# Unknown countries\n");
+    $zonefile->print("Cxx.${zone}:${cluster}.${zone}:600\n");
+}
+
+$zonefile->print("# Servers\n");
+
+# Output A records for each cluster
+while (my($name,$cluster) = each %$clusters)
 {
-    $zonefile->print("Cxx.${zone}:${server}.${zone}:600\n");
+    foreach my $server (@{$cluster->{servers}})
+    {
+        if ($server->{status} eq "up")
+        {
+            $zonefile->print("+${name}.${zone}:$server->{ipv4}:600\n");
+
+            if ($server->{ipv6})
+            {
+#                $zonefile->print("3${name}.${zone}:$server->{ipv6}:600\n");
+            }
+        }
+    }
 }
 
 # Output the GeoJSON text
@@ -220,52 +299,52 @@ sub centre_lon
 }
 
 #
-# Match a country against a server
+# Match a country against a cluster
 #
 sub match_country
 {
-    my $server = shift;
+    my $cluster = shift;
     my $country = shift;
     my $continent = shift;
     my $match;
 
-    if ($server->{preferred} &&
-        $server->{preferred}->{countries} &&
-        grep { $_ eq $country } @{$server->{preferred}->{countries}})
+    if ($cluster->{preferred} &&
+        $cluster->{preferred}->{countries} &&
+        grep { $_ eq $country } @{$cluster->{preferred}->{countries}})
     {
         $match = "preferred";
     }
-    elsif ($server->{preferred} &&
-           $server->{preferred}->{continents} &&
-           grep { $_ eq $continent } @{$server->{preferred}->{continents}})
+    elsif ($cluster->{preferred} &&
+           $cluster->{preferred}->{continents} &&
+           grep { $_ eq $continent } @{$cluster->{preferred}->{continents}})
     {
         $match = "preferred";
     }
-    elsif ($server->{allowed} &&
-           $server->{allowed}->{countries} &&
-           grep { $_ eq $country } @{$server->{allowed}->{countries}})
+    elsif ($cluster->{allowed} &&
+           $cluster->{allowed}->{countries} &&
+           grep { $_ eq $country } @{$cluster->{allowed}->{countries}})
     {
         $match = "allowed";
     }
-    elsif ($server->{allowed} &&
-           $server->{allowed}->{continents} &&
-           grep { $_ eq $continent } @{$server->{allowed}->{continents}})
+    elsif ($cluster->{allowed} &&
+           $cluster->{allowed}->{continents} &&
+           grep { $_ eq $continent } @{$cluster->{allowed}->{continents}})
     {
         $match = "allowed";
     }
-    elsif ($server->{denied} &&
-        $server->{denied}->{countries} &&
-        grep { $_ eq $country } @{$server->{preferred}->{countries}})
+    elsif ($cluster->{denied} &&
+           $cluster->{denied}->{countries} &&
+           grep { $_ eq $country } @{$cluster->{preferred}->{countries}})
     {
         $match = "denied";
     }
-    elsif ($server->{denied} &&
-           $server->{denied}->{continents} &&
-           grep { $_ eq $continent } @{$server->{preferred}->{continents}})
+    elsif ($cluster->{denied} &&
+           $cluster->{denied}->{continents} &&
+           grep { $_ eq $continent } @{$cluster->{preferred}->{continents}})
     {
         $match = "denied";
     }
-    elsif ($server->{allowed})
+    elsif ($cluster->{allowed})
     {
         $match = "denied";
     }
@@ -289,3 +368,28 @@ sub distance
 
     return great_circle_distance($lon1, pip2 - $lat1, $lon2, pip2 - $lat2);
 }
+
+#
+# Allocate each country to a cluster
+#
+sub allocate_clusters
+{
+    my $mappings = shift;
+
+    # Loop over the mappings, trying to assign each country to the
+    # nearest cluster, but subject to the bandwidth limits
+    foreach my $mapping (sort {  $b->{priority} <=> $a->{priority} || $a->{distance} <=> $b->{distance} } @$mappings)
+    {
+        my $country = $mapping->{country};
+        my $cluster = $mapping->{cluster};
+
+        if (!exists($country->{cluster}) &&
+            $cluster->{bandwidth_used} + $country->{bandwidth} <= $cluster->{bandwidth_limit})
+        {
+            $country->{cluster} = $cluster;
+            $cluster->{bandwidth_used} = $cluster->{bandwidth_used} + $country->{bandwidth};
+        }
+    }
+
+    return;
+}