--- bin/Replicate	2000/12/20 17:22:35	1.1
+++ bin/Replicate	2003/08/06 00:28:17	1.7
@@ -1,4 +1,4 @@
-# -*- perl -*-
+#!/usr/bin/perl -w
 # Replicate
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -6,61 +6,118 @@
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-use lib "@LIBDIR@";
+BEGIN {
+	my $basedir = $0; $basedir =~ s#/[^/]+$##;
+	unshift(@INC, "$basedir/../share");
+}
 
+use strict;
 use IO::File;
 use Getopt::Long;
 use RServ;
+use Sys::Hostname;
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "masterhost=s", "slavehost=s", "host=s",
-		     "masteruser=s", "slaveuser=s", "user=s",
-		     "masterpassword=s", "slavepassword=s", "password=s");
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || "__Snapshot";
-
-if (defined($opt_help) || (scalar(@ARGV) < 2)) {
-    print "Usage: $0 --snapshot=file --host=name --user=name --password=string masterdb slavedb\n";
-    print "\t--masterhost=name --masteruser=name --masterpassword=string\n";
-    print "\t--slavehost=name --slaveuser=name --slavepassword=string\n";
+my ($debug,$verbose) = (0,0);
+my ($help,$masterhost,$masterport,$masteruser,$masterpassword,
+	$slavehost,$slaveport,$slaveuser,$slavepassword);
+my $snapshot = ".__Snapshot";
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
+	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"snapshot=s" => \$snapshot,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2)) {
+    print "Usage: $0 [options] masterdb slavedb
+Options:
+	--masterhost=hostname --masterport=port
+	--masteruser=username --masterpassword=string
+	--snapshot=snapshot
+";
     exit ((scalar(@ARGV) < 2)? 1:0);
 }
 
+$snapshot .= '.' . $$;
+
+$RServ::quiet = !$verbose;
+if ($debug) {
+	$RServ::quiet = 0;
+	no warnings 'vars';
+	$RServ::debug = $debug;
+}
+
 my $master = $ARGV[0] || "master";
 my $slave = $ARGV[1] || "slave";
-my $server = 0;
+
+# first, let's check if a instance is alrealy running
+
+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 ARQ, ">$fname" || die "Cannot open $fname: $!\n";
+print ARQ "$$\n";
+close ARQ;
 
 my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_masterhost" if (defined($opt_masterhost));
-$minfo = "$minfo user=$opt_masteruser" if (defined($opt_masteruser));
-$minfo = "$minfo password=$opt_masterpassword" if (defined($opt_masterpassword));
+$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=$opt_slavehost" if (defined($opt_slavehost));
-$sinfo = "$sinfo user=$opt_slaveuser" if (defined($opt_slaveuser));
-$sinfo = "$sinfo password=$opt_slavepassword" if (defined($opt_slavepassword));
+$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));
 
 print "Master connection is $minfo\n" if ($debug);
 print "Slave connection is $sinfo\n" if ($debug);
 
 my $mconn = Pg::connectdb($minfo);
+if ($mconn->status != Pg::PGRES_CONNECTION_OK) {
+    print STDERR "Failed opening $minfo\n";
+    unlink $fname;
+    exit 1;
+}
 my $sconn = Pg::connectdb($sinfo);
+if ($sconn->status != Pg::PGRES_CONNECTION_OK) {
+    print STDERR "Failed opening $sinfo\n";
+    unlink $fname;
+    exit 1;
+}
 
+my $slaveId = GetSlaveId($mconn, $slave, defined($slavehost) ? $slavehost : hostname);
+if ($slaveId < 0) {
+    unlink $fname;
+    die "\n>>>>>>>>>>>>> ERROR\n";
+}
 SyncSync($mconn, $sconn);
 
 my $outf = new IO::File;
 open $outf, ">$snapshot";
 print "\n>>>>>>>>>>>>> Prepare Snapshot\n\n" if ($verbose);
-$res = PrepareSnapshot($mconn, $outf, $server);
+my $res = PrepareSnapshot($mconn, $sconn, $outf, $slaveId);
 close $outf;
-die "\n>>>>>>>>>>>>> ERROR\n" if $res < 0;
+if ($res < 0) {
+    unlink $fname;
+    die "\n>>>>>>>>>>>>> ERROR\n";
+}
 if ($res == 0)
 {
-	print "\n>>>>>>>>>>>>> DBases are sync-ed\n" if ($verbose);
-	exit(0);
+    print "\n>>>>>>>>>>>>> DBases are sync-ed\n" if ($verbose);
+    unlink $snapshot unless ($debug);
+    unlink $fname;
+    exit(0);
 }
 
 my $inpf = new IO::File;
@@ -68,15 +125,19 @@
 print "\n>>>>>>>>>>>>> Apply Snapshot\n\n" if ($verbose);
 $res = ApplySnapshot($sconn, $inpf);
 close $inpf;
-die "\n>>>>>>>>>>>>> ERROR\n" if $res < 0;
+if ($res < 0) {
+    unlink $fname;
+    die "\n>>>>>>>>>>>>> ERROR\n";
+}
 
 if ($res > 0)
 {
-	print "Snapshot applied\n" if ($verbose);
-	unlink $snapshot unless ($debug);
-	SyncSync($mconn, $sconn);
+    print "Snapshot applied\n" if ($verbose);
+    unlink $snapshot unless ($debug);
+    SyncSync($mconn, $sconn);
 }
 
+unlink $fname;
 exit(0);
 
 ###########################################################################
@@ -87,13 +148,13 @@
 
     print "\n>>>>>>>>>>>>> Sync SyncID\n\n" if ($verbose);
     print "Get last SyncID from Slave DB\n" if ($verbose);
-    $syncid = GetSyncID($sconn);
-    if ($syncid > 0)
+    my $syncid = GetSyncID($sconn);
+    if ($syncid && $syncid > 0)
     {
 	print "Last SyncID applied: $syncid\n" if ($verbose);
 	print "Sync SyncID\n" if ($verbose);
 
-	$res = SyncSyncID($mconn, $server, $syncid);
+	$res = SyncSyncID($mconn, $slaveId, $syncid);
 
 	print "Succeeded\n" if (($res > 0) && ($verbose));
     }