--- bin/Replicate	2003/08/05 21:41:25	1.6
+++ bin/Replicate	2003/11/02 15:43:05	1.17
@@ -15,20 +15,23 @@
 use IO::File;
 use Getopt::Long;
 use RServ;
-use Sys::Hostname;
 
 $| = 1;
 
-my ($debug,$verbose) = (0,0);
+#my ($debug,$verbose) = (0,0);
 my ($help,$masterhost,$masterport,$masteruser,$masterpassword,
 	$slavehost,$slaveport,$slaveuser,$slavepassword);
 my $snapshot = ".__Snapshot";
+my $multiplemaster = 0;
 
 my $result = GetOptions(
 	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
 	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
 	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
+	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
 	"snapshot=s" => \$snapshot,
+	"multiplemaster" => \$multiplemaster,
 	);
 
 if (defined($help) || (scalar(@ARGV) < 2)) {
@@ -37,6 +40,7 @@
 	--masterhost=hostname --masterport=port
 	--masteruser=username --masterpassword=string
 	--snapshot=snapshot
+	[--masterserver=master_number]
 ";
     exit ((scalar(@ARGV) < 2)? 1:0);
 }
@@ -44,38 +48,56 @@
 $snapshot .= '.' . $$;
 
 $RServ::quiet = !$verbose;
-if ($debug) {
-	$RServ::quiet = 0;
-	no warnings 'vars';
-	$RServ::debug = $debug;
-}
+#if ($debug) {
+#print "## q:$RServ::quiet v:$RServ::verbose d:$RServ::debug\n";
+#	$RServ::quiet = 0;
+#	no warnings 'vars';
+#	$RServ::debug = $debug;
+#print "## q:$RServ::quiet v:$RServ::verbose d:$RServ::debug\n";
+#}
 
 my $master = $ARGV[0] || "master";
 my $slave = $ARGV[1] || "slave";
+my $tables = $#ARGV < 2 ? undef : { map {($_, undef)} @ARGV[2..$#ARGV] };
 
 # first, let's check if a instance is alrealy running
 
-my $str = $master.'@'.$masterhost.':'.$slave.'@'.$slavehost;
+my $str = $master;
+$str .= '@'.$masterhost if (defined($masterhost));
+$str .= ':'.$slave;
+$str .= '@'.$slavehost if (defined($slavehost));
 my $fname = "/tmp/.lock_rserv-$str";
 if (-e $fname) {
-    print STDERR "rServ is already running for $str. Remove $fname to override this.\n";
-    exit(1);
+	open(PID,$fname) || die "can't open pid file '$fname'";
+	my $pid = <PID>; chomp($pid);
+	close(PID);
+	open(PS,"ps ax |") || die "can't start ps to check for running rServ with pid $pid\n";
+	my $is_running = 0;
+	while(<PS>) {
+		chomp;
+		$is_running = 1 if (/^\s*$pid\s/);
+	}
+	close(PS);
+	if ($is_running) {
+		print STDERR "rServ [$pid] is already running for $str. Remove $fname to override this.\n";
+		exit(1);
+	} else {
+		print STDERR "found stale pid file, but no running rServ [$pid], overriding.\n";
+	}
 }
 open ARQ, ">$fname" || die "Cannot open $fname: $!\n";
 print ARQ "$$\n";
 close ARQ;
 
-my $minfo = "dbname=$master";
-$minfo = "$minfo host=$masterhost" if (defined($masterhost));
-$minfo = "$minfo port=$masterport" if (defined($masterport));
-$minfo = "$minfo user=$masteruser" if (defined($masteruser));
-$minfo = "$minfo password=$masterpassword" if (defined($masterpassword));
-
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$slavehost" if (defined($slavehost));
-$sinfo = "$sinfo port=$slaveport" if (defined($slaveport));
-$sinfo = "$sinfo user=$slaveuser" if (defined($slaveuser));
-$sinfo = "$sinfo password=$slavepassword" if (defined($slavepassword));
+$SIG{__DIE__} = \&mydie;
+sub mydie {
+	unlink $fname;
+	print @_;
+	exit 1;
+}
+
+my $minfo = MkInfo($master,$masterhost,$masterport,$masteruser,$masterpassword);
+my $sinfo = MkInfo($slave,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
 print "Master connection is $minfo\n" if ($debug);
 print "Slave connection is $sinfo\n" if ($debug);
@@ -93,17 +115,39 @@
     exit 1;
 }
 
-my $slaveId = GetSlaveId($mconn, $slave, defined($slavehost) ? $slavehost : hostname);
+$slavehost = 'localhost' if (! $slavehost);
+$masterhost = 'localhost' if (! $masterhost);
+
+my $slaveId = GetServerId($mconn, $slave, $slavehost);
+
+die "\n>>>>>>>>>>>>> ERROR: Can't GetServerId for $sinfo\n" if (! defined($slaveId));
+
 if ($slaveId < 0) {
     unlink $fname;
-    die "\n>>>>>>>>>>>>> ERROR\n";
+    die "\n>>>>>>>>>>>>> ERROR: GetServerId returned $slaveId < 0\n";
 }
 SyncSync($mconn, $sconn);
 
+my $masterId = 0;
+if ($multiplemaster || $slaveId == 0) {
+	$masterId = GetServerId($mconn, $master, $masterhost);
+
+	die "\n>>>>>>>>>>>>> ERROR: Can't GetServerId for $sinfo\n" if (! defined($masterId));
+
+	if ($masterId < 0) {
+	    unlink $fname;
+	    die "\n>>>>>>>>>>>>> ERROR: GetServerId returned $masterId < 0\n";
+	}
+	SyncSync($sconn, $mconn);
+}
+
+print "Using snapshot file: $snapshot\n" if ($debug);
+
 my $outf = new IO::File;
 open $outf, ">$snapshot";
 print "\n>>>>>>>>>>>>> Prepare Snapshot\n\n" if ($verbose);
-my $res = PrepareSnapshot($mconn, $sconn, $outf, $slaveId);
+print "master id: $masterId slave id: $slaveId\n" if ($debug);
+my $res = PrepareSnapshot($mconn, $sconn, $outf, $masterId, $slaveId, $multiplemaster, $tables);
 close $outf;
 if ($res < 0) {
     unlink $fname;
@@ -120,7 +164,7 @@
 my $inpf = new IO::File;
 open $inpf, "<$snapshot";
 print "\n>>>>>>>>>>>>> Apply Snapshot\n\n" if ($verbose);
-$res = ApplySnapshot($sconn, $inpf);
+$res = ApplySnapshot($sconn, $inpf, $multiplemaster, $tables);
 close $inpf;
 if ($res < 0) {
     unlink $fname;
@@ -146,7 +190,7 @@
     print "\n>>>>>>>>>>>>> Sync SyncID\n\n" if ($verbose);
     print "Get last SyncID from Slave DB\n" if ($verbose);
     my $syncid = GetSyncID($sconn);
-    if ($syncid > 0)
+    if ($syncid && $syncid > 0)
     {
 	print "Last SyncID applied: $syncid\n" if ($verbose);
 	print "Sync SyncID\n" if ($verbose);