Changeset 33415 for branches/meh_branches/ppstack_test/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippScripts/scripts/magic_destreak_revert.pl

@@ -9 +9 @@
 my $host = hostname();
 my $date = `date`;
-print "\n\n";
-print "Starting script $0 on $host at $date\n\n";
+print STDERR "\n\n";
+print STDERR "Starting script $0 on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -86 +86 @@
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
-$ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
+$ipprc->redirect_to_logfile($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
 
 &my_die("bytes and md5sum are is required for raw stage stage", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) if ($replace and $stage eq 'raw' and (!$bytes or !$md5sum));
@@ -413 +413 @@
     if ($backup_is_not_destreaked) {
         if ($original_is_not_destreaked) {
-            # this is unexpected result. throw an error so this can be checked manually
-            print STDERR "both files appear to not be destreaked\n";
+            print STDERR "\nBoth files appear to not be destreaked.\n";
             print STDERR "original: $original\n";
             print STDERR "backup:   $backup\n";
             my $o_basename = basename($o_path);
             my $b_basename = basename($b_path);
-            if (!($o_basename =~ /SR_/) and ($b_basename =~ /SR_/)) {
-                print " basenames are as expected it is safe to revert\n";
+            # if original file does not have SR_ in basename and the backup does then the 
+            # files are in their original state. Just delete back up file
+            # otherwise go to failed_revert for manual inspection.
+            # XXX: We probably can get by with just checking the basename of the original file
+            if (!($o_basename =~ /SR_/) ) {
+            # if (!($o_basename =~ /SR_/) and ($b_basename =~ /SR_/)) {
+                print STDERR " basenames are as expected it is safe to delete backup file\n";
+                if (! $ipprc->file_delete($backup, $force)) {
+                    print STDERR "failed to delete $backup\n";
+                    return 0;
+                }
+                return 1;
             } else {
+                # this is an unexpected result. throw an error so this can be checked manually
+                print STDERR " basenames for files are as NOT as expected unsafe to revert\n";
+                print STDERR " o_basename: $o_basename\n";
+                print STDERR " b_basename: $b_basename\n";
                 return 0;
             }
@@ -470 +483 @@
     foreach my $file (@_) {
         next if !$file;
-        if ($ipprc->file_exists($file)) {
-            if (!$ipprc->file_delete($file)) {
-                &my_die("failed to delete recovery file $file", $magic_ds_id, $component, $PS_EXIT_UNKNOWN_ERROR);
-            }
-        }
+        # don't care if this fails or not (it will fail if storage
+        # object doesn't exist
+        $ipprc->kill_file($file);
     }
 }
@@ -500 +511 @@
     my $command = "$magicdstool -updaterun";
     $command   .= " -magic_ds_id $magic_ds_id";
-    $command   .= " -set_state failed_revert";
+    if ($run_state ne 'update') {
+        $command .= " -set_state failed_revert";
+    } else {
+        $command .= " -set_state failed_revert_ud";
+    }
     $command   .= " -dbname $dbname" if defined $dbname;