Changeset 37267

Timestamp:

Aug 19, 2014, 1:07:16 PM (12 years ago)

Author:

eugene

Message:

updates to sc_retry_return

File:

• tags/ipp-pv3-20140717/ippScripts/scripts/sc_retry_return.pl (modified) (1 diff)

tags/ipp-pv3-20140717/ippScripts/scripts/sc_retry_return.pl

@@ -166 +166 @@
     }
 
-    open(DBF,"$file") || warn "Missing file $file\n";
-    my $cmd = <DBF>;
-    close(DBF);
-
-    chomp($cmd);
-
-    $cmd =~ s/-/ -/g; # This is just a safety check for missing space.
-    if ($cmd == "") {
-        print STDERR "empty dbinfo file for $stage_id, $class_id, skipping\n";
-        next;
-    }
-
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $cmd, verbose => $verbose);
-    unless ($success) {
-        # This shouldn't fail, but we also can't suddenly abort if something does fail.
-        # Now we're going to drop the component that owns this dbinfo, which should force a retry.
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("The command that shouldn't fail has failed: $file $cmd $remote_id $error_code");
-        if ($poll_word ne 'Completed') {  # If the job claims it completed, then we're fighting the network.
-            # drop_component($remote_id,$cmd,$file);
-            print STDERR "we should drop this component: $cmd\n";
-        }
+    {
+        open(DBF,"$file") || warn "Missing file $file\n";
+        my $cmd = <DBF>;
+        close(DBF);
+
+        chomp($cmd);
+
+        $cmd =~ s/-/ -/g; # This is just a safety check for missing space.
+        if ($cmd == "") {
+            print STDERR "empty dbinfo file for $stage_id, $class_id, skipping\n";
+            next;
+        }
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $cmd, verbose => $verbose);
+        unless ($success) {
+            # This shouldn't fail, but we also can't suddenly abort if something does fail.
+            # Now we're going to drop the component that owns this dbinfo, which should force a retry.
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            warn("The command that shouldn't fail has failed: $file $cmd $remote_id $error_code");
+            if ($poll_word ne 'Completed') {  # If the job claims it completed, then we're fighting the network.
+                # drop_component($remote_id,$cmd,$file);
+                print STDERR "we should drop this component: $cmd\n";
+            }
+        }
     }
 }