WebSVN – sysadmin_scripts – Diff – /trunk/zfs/replication/sync

 # load Configuration File
 # read the config file and return it
 sub readConfig {
    my $filename = shift;
+   die "Config file $filename not found: $!" unless -f $filename;
    my $yaml = YAML::Tiny->new( {} );
    if ( -f $filename ) {
       $yaml = YAML::Tiny->read( $filename );
+   }
    return $yaml->[0];
 # runs a command, redirecting stderr to stdout (which it ignores)
 # then returns 0 on success.
 # if error, returns string describing error
 sub runCommand {
    my $command = shift;
-   qx/$command 2>&1/;
+   my $output = qx/$command 2>&1/;
    if ($? == -1) {
-      return "failed to execute: $!";
+      return (-1, "failed to execute: $!" );
    } elsif ($? & 127) {
-      return sprintf "child died with signal %d, %s coredump",
+      return (-1,sprintf "child died with signal %d, %s coredump",
-        ($? & 127),  ($? & 128) ? 'with' : 'without';
+        ($? & 127),  ($? & 128) ? 'with' : 'without');
    } else {
-      return sprintf "child exited with value %d", $? >> 8 if $? >> 8;
+      return ( $?>>8, sprintf "child exited with value %d", $? >> 8 ) if $? >> 8;
+   }
-   return 0;
+   return (0, $output);
+}
 # grabs the encryption key from the remote server, and uses it to unlock the
 # datasets, then mount the drives.
 # a return of '' is success, anything else is an error
    &runCommand( "scp $config->{remoteMachine}->{ip}:$config->{remoteMachine}->{encryptionKeyPath} $config->{localMachine}->{encryptionKeyPath}" );
    # If we do not have the encryption key, we need to abort
    return "Could not copy file $config->{remoteMachine}->{ip}:$config->{remoteMachine}->{encryptionKeyPath}, aborting"
       unless -f $config->{'localMachine'}->{'encryptionKeyPath'};
    my $error = '';
+   my $output = '';
    # load the key into zfs and unlock all volumes
-   $error = &runCommand( "zfs load-key -a" );
+   ($error,$output) = &runCommand( "zfs load-key -a" );
    # finally, remount all of the zfs shares which need the key
-   $error = &runCommand( "zfs mount -a" ) unless $error;
+   ($error,$output) = &runCommand( "zfs mount -a" ) unless $error;
    # if we succeeded, we want to shred the keyfile
    &shredFile( $config->{localMachine}->{encryptionKeyPath} ) if -f $config->{localMachine}->{encryptionKeyPath};
    return $error;
+}
 # if neither exists, begin sync
 sub checkMaintenance {
    my $config = shift;
    # see if maintenance is set on remote. If so, simply return the message
    if ( $config->{'remoteMachine'}->{'up'} ) {
-      if ( ! &runCommand( "ssh $configuration->{remoteMachine}->{ip} 'ls $configuration->{remoteMachine}->{maintenanceFlag}'" ) ) {
+      my ($error, $output) = &runCommand( "ssh $configuration->{remoteMachine}->{ip} 'ls $configuration->{remoteMachine}->{maintenanceFlag}'" );
+      if ( ! $error ) {
          # remove the file from the remote server
          &runCommand( "ssh $configuration->{remoteMachine}->{ip} 'rm $configuration->{remoteMachine}->{maintenanceFlag}'" );
          # create a valid return, which will exit the program
          return "Maintenance Flag found on remote machine";
+      }
 $configuration = &readConfig($configFileName);
 &sendMail( "mc-009 has been started, " . &currentTime() . " checking for maintenance mode", $configuration );
 # see if remote machine is up by sending one ping. Expect response in 5 seconds
-$configuration->{'remoteMachine'}->{'up'} =
+my ( $error,$output) = &runCommand( "ping -c 1 -t 5 " . $configuration->{'remoteMachine'}->{'ip'} );
-   ! &runCommand( "ping -c 1 -t 5 " . $configuration->{'remoteMachine'}->{'ip'} );
+$configuration->{'remoteMachine'}->{'up'} = ! $error;
 push @status, "remote machine ($configuration->{'remoteMachine'}->{'ip'}) is " . ( $configuration->{'remoteMachine'}->{'up'} ? 'Up' : 'Down' ) . "\n";
 # check for maintenance flags, exit if we should go into mainteannce mode
 #if ( my $result = &checkMaintenance( $configuration ) ) {
 #   push @status,$result;
 # we can not connect to the remote server, so just shut down
 &shutdownMachine( $configuration, "No connection to remote machine", @status ) unless $configuration->{'remoteMachine'}->{'up'};
 # try to mount the datasets
-my $error = &mountDrives( $configuration );
+($error,$output) = &mountDrives( $configuration );
 if ( $error ) { # could not mount datasets
    push @status, $error;
-   &shutdownMachine( $configuration, "Mount Drive Error", @status );
+   &shutdownMachine( $configuration, "Mount Drive Error: [$output]", @status );
+}
 &sendMail( "Backup has been started at " . &currentTime(), $configuration, "Backup Starting" );
 push @status, "Backup started at: " . &currentTime();
 foreach my $sourceDir ( keys %{$configuration->{'remoteMachine'}->{'dataset'}} ) {
    my $command = $replicateScript . ' ' .
                  $configuration->{'remoteMachine'}->{'ip'} . ':' .
                  $configuration->{'remoteMachine'}->{'dataset'}->{$sourceDir} . '/' . $sourceDir . ' ' .
                  $configuration->{'localMachine'}->{'targetDataset'} . '/' . $sourceDir;
-   push @status, "Running $command at " . &currentTime();
+   push @status, "=== Running $command at " . &currentTime();
-   push @status, &runCommand( $command );
+   my ($error, $output) = &runCommand( $command );
+   push @status, $output;
-   push @status, "Completed $command at " . &currentTime();
+   push @status, "=== Completed $command with status $error at " . &currentTime();
+}
-push @status, "Backup finished at: " . &currentTime();
+push @status, "==== Backup finished at: " . &currentTime();
 &shutdownMachine( $configuration, "Backup Complete", @status );
 ;

Subversion Repositories sysadmin_scripts

(root)/trunk/zfs/replication/sync – Rev 167 → 168