Changeset 36476 for trunk/pstamp/scripts

Timestamp:

Feb 5, 2014, 10:58:58 AM (12 years ago)

Author:

bills

Message:

use ps_ud_$LABEL for updates instead of pstampDependent.rlabel (which is deprecated)
This works better if the request's label is changed after a dependent is queued

File:

• trunk/pstamp/scripts/pstamp_checkdependent.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstamp_checkdependent.pl

@@ -27 +27 @@
 my $IPP_DIFF_MODE_STACK_STACK = 4;
 
-my ($dep_id, $stage, $stage_id, $component, $imagedb, $rlabel, $need_magic, $fault_count, $max_fault_count, $logfile);
+my ($dep_id, $stage, $stage_id, $component, $imagedb, $label, $rlabel, $need_magic, $fault_count, $max_fault_count, $logfile);
 my ($dbname, $ps_dbserver, $verbose, $save_temps, $no_update);
 
@@ -36 +36 @@
     'component=s'   =>  \$component,
     'imagedb=s'     =>  \$imagedb,      # dbname for images lookups.
-    'rlabel=s'      =>  \$rlabel,
+    'label=s'       =>  \$label,        # request's label
+    'rlabel=s'      =>  \$rlabel,       # pstampDependent.rlabel (deprecated)
     'need_magic'    =>  \$need_magic,
     'fault_count=i' =>  \$fault_count,
@@ -72 +73 @@
    $ipprc->redirect_output($logfile);
 }
+
+if ($label) {
+    # rlabel is deprecated. Use one based on the supplied label parameter which is the current label 
+    # for the request, which may be different than the one given to the dependent when the job was parsed.
+    # XXX: having the convention that update label is 'ps_ud_' . $label of request embedded here 
+    # (and formerly in pstampparse.pl) is not particularly clean but it's simple.
+    my $new_rlabel = 'ps_ud_' . $label;
+    if ($new_rlabel ne $rlabel) {
+        print "Notice: using $new_rlabel instead of $rlabel for update label.\n";
+        $rlabel = $new_rlabel;
+    }
+}
+
 
 if (!$ps_dbserver) {
@@ -886 +900 @@
 
     # Stop faulting components. With the death of magic the likelyhood that something is truly gone
-    # forever is much smaller. The false alarm rate due to temporary file system problems is far too high
+    # forever is much smaller. The false alarm rate is far too high
     return;