Merge lp:~diego-fmpwizard/mysql-sandbox/repl-topo-aggr-support into lp:~sandbox-developers/mysql-sandbox/replication-topo

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

  * Added support for the Aggregator plugin
  * Added suport for the new mysql-monitor-agent init.d script
  * Added support for specifying agent uuid on dot file

[Oldag (oldag)]

looks good. merge it and push.

review: Approve

=== modified file 'bin/make_sandbox_topology'
--- bin/make_sandbox_topology	2009-05-08 14:22:36 +0000
+++ bin/make_sandbox_topology	2010-01-15 15:39:12 +0000
@@ -90,6 +90,8 @@
 my $MYSQL = 'mysql';
 my $PROXY = 'proxy';
 my $PROXY_ADDR = 'proxy-address';
+my $AGENT_UUID = 'agent-uuid';
+my $AGGREGATOR_ADDR = 'aggr-address';
 my $HOST = 'hostname';
 my $PLUGINS = 'plugins';
 my $BACKENDS = 'proxy-backend-addresses';
@@ -100,7 +102,7 @@
 	my $attrs = $node->{$ATTRS};
 	my $opts = $node->{$OPTS};
 	my $class = $node->{$CLASS};
-    while ((my $key,my $value) = each %$attrs) {
+        while ((my $key,my $value) = each %$attrs) {
 		if ($key =~ /^$class\./) {
 		    $key =~ s/^$class\.(.*)$/$1/;
 			# allow a node-local value to win
@@ -110,7 +112,7 @@
 		} else {
 			$opts->{$key} = $value;
 		}
-    }
+        }
 }
 
 sub init_mysql_node {
@@ -132,6 +134,7 @@
     my ($node) = @_;
 	my $host;
 	my $port;
+        my $aggr_port;
 	if (not exists $node->{$ATTRS}->{$PROXY_ADDR}) {
 	    $port = $next_port++;
 	    $node->{$OPTS}->{$PROXY_ADDR} = ":" . $port; 
@@ -140,18 +143,38 @@
 	    my $pa = $node->{$ATTRS}->{$PROXY_ADDR};
 		($host, $port) = split(/:/, $pa);
 	    $node->{$OPTS}->{$PROXY_ADDR} = $pa; 
-    }
+        }
 	attributes_to_options($node);
 	my $plugins = $node->{$OPTS}->{$PLUGINS} || 'proxy';
-    $node->{$OPTS}->{$PLUGINS} = $plugins;
+        $node->{$OPTS}->{$PLUGINS} = $plugins;
 	$node->{$PORT} = $port;
 	$node->{$HOST} = $host;
 	$node->{'is_proxy'} = $plugins =~ /proxy/;
 	$node->{'is_agent'} = $plugins =~ /agent/;
-	if ($node->{'is_agent'}) {
-	    my $uuid = `uuidgen` or die "unable to generate uuid\n";
-	    $node->{$OPTS}->{'agent-uuid'} = lc $uuid;
+	$node->{'is_aggregator'} = $plugins =~ /aggr/;
+
+        if ($node->{'is_agent'}) {
+	    my $uuid;
+            if ( exists $node->{$ATTRS}->{$AGENT_UUID}) {
+                $uuid = $node->{$ATTRS}->{$AGENT_UUID};
+            } else {
+                $uuid = `uuidgen` or die "unable to generate uuid\n";
+            }
+            $node->{$OPTS}->{'agent-uuid'} = lc $uuid;
 	}
+
+        if ($node->{'is_aggregator'}) {
+
+            if (not exists $node->{$ATTRS}->{$AGGREGATOR_ADDR}) {
+                $aggr_port = $next_port++;
+                $node->{$OPTS}->{$AGGREGATOR_ADDR} = ":" . $aggr_port;
+                $host = hostname;
+            } else {
+                my $pa = $node->{$ATTRS}->{$AGGREGATOR_ADDR};
+                ($host, $port) = split(/:/, $pa);
+                $node->{$OPTS}->{$AGGREGATOR_ADDR} = $pa;
+            }
+        }
 	push @proxies, $node;
 }
 
@@ -237,10 +260,12 @@
 my $proxy;
 if (@proxies) {
     $proxy_home = $ENV{PROXY_HOME} || die "Proxies defined, with no PROXY_HOME specified";
-	if (-x "$proxy_home/bin/mysql-proxy") {
-	    $proxy = "$proxy_home/bin/mysql-proxy";
-	} elsif (-x "$proxy_home/sbin/mysql-proxy") {
-		$proxy = "$proxy_home/sbin/mysql-proxy";
+	if (-x "$proxy_home/bin/mysql-monitor-agent") {
+	    $proxy = "$proxy_home/bin/mysql-monitor-agent";
+	} elsif (-x "$proxy_home/bin/mysql-proxy") {
+		$proxy = "$proxy_home/bin/mysql-proxy";
+        } elsif (-x "$proxy_home/sbin/mysql-proxy") {
+                $proxy = "$proxy_home/sbin/mysql-proxy";
 	} else {
 	    die "mysql-proxy not found in \$PROXY_HOME/bin or \$PROXY_HOME/sbin";
 	}
@@ -362,18 +387,19 @@
 for my $node (@proxies) {
     my $name = $node->{$NAME};
 
-	my $ini = "$name/chassis.ini";
+    my $ini = "$name/chassis.ini";
     mkdir "$name";
 
     $msb->write_to($ini, '>', '[mysql-proxy]');
     while ((my $key,my $value) = each %{$node->{$OPTS}}) {
 		$msb->write_to($ini, '>>', "$key=$value");
     }
+    chmod 0600, $ini;
 
 	if ($node->{'is_agent'} == 1) {
 	    my $instances = $node->{$OPTS}->{$INSTANCES};
 	    mkdir $instances;
-        my @successors = $g->successors($node->{$NAME});
+            my @successors = $g->successors($node->{$NAME});
 		for my $backend_name (@successors) {
 		    my $dir = "$instances/$backend_name";
 			mkdir $dir;
@@ -389,6 +415,7 @@
 			$msb->write_to($ini, '>>', "user=msandbox");
 			$msb->write_to($ini, '>>', "password=msandbox");
 			# TODO: socket support
+                        chmod 0600, $ini;
 		}
 	}