Changeset 30794

Timestamp:

Mar 4, 2011, 12:27:07 PM (15 years ago)

Author:

bills

Message:

merge in latest postage stamp server updates

Location:

tags/ipp-20110218

Files:

• ippTasks/pstamp.pro (modified) (2 diffs, 1 prop)
• pstamp (modified) (1 prop)
• pstamp/scripts/psstatus (modified) (1 prop)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (3 diffs, 1 prop)
• pstamp/scripts/pstampstopfaulted (modified) (1 diff)

tags/ipp-20110218/ippTasks/pstamp.pro

@@ -19 +19 @@
 
 # give up on dependents with fault_count >= $PSTAMP_MAX_FAULT_COUNT
-$PSTAMP_MAX_FAULT_COUNT = 5
+$PSTAMP_MAX_FAULT_COUNT = 3
 macro set.max.fault.count
     $PSTAMP_MAX_FAULT_COUNT = $1
@@ -928 +928 @@
 
     task.exec
+        stdout $LOGSUBDIR/pstamp.stopfaulted.log
         stderr $LOGSUBDIR/pstamp.stopfaulted.log
-        stderr $LOGSUBDIR/pstamp.stopfaulted.log
-        $run = pstampstopfaulted
+        $run = pstampstopfaulted $PSTAMP_MAX_FAULT_COUNT
         if ($DB:n == 0)
             option DEFAULT

tags/ipp-20110218/pstamp/scripts/pstampparse.pl

@@ -31 +31 @@
 my $no_update;
 my $dest_requires_magic;
+
+# set this to true to disable update processing
+my $no_updates_allowed = 0;
 
 GetOptions(
@@ -505 +508 @@
     my $components = $row->{components};
 
+    $option_mask |= $PSTAMP_NO_WAIT_FOR_UPDATE if $no_updates_allowed;
+
     my $roi_string;
 
@@ -677 +682 @@
     my $rownum = $row->{ROWNUM};
     my $option_mask = $row->{OPTION_MASK};
+
+    $option_mask |= $PSTAMP_NO_WAIT_FOR_UPDATE if $no_updates_allowed;
 
     # For dist_bundle we need

tags/ipp-20110218/pstamp/scripts/pstampstopfaulted

@@ +1 @@
+#!/bin/bash
+#
+# script executed by the task pstamp.stopfaulted to stop proceessing of jobs
+# and dependents that have fault_count >= some maximum value. That value is expected
+# to be passed in as an argument otherwise the default in pstamptool is used
+# All arguments are passed to pstamptool
 
-# script executed by the task pstamp.stopfaulted to stop proceessing of jobs
-# and dependents that have faulted 5 or more times
-# all arguments to this script are passed to pstamptool
-
-# 25 is PSTAMP_NOT_AVAILABLE
+# note: 25 is PSTAMP_NOT_AVAILABLE
 fault_code=25
-fault_count=3
 
 date
 echo stopping faulted dependent jobs
-pstamptool -stopdependentjob -set_fault $fault_code -fault_count $fault_count $*
+pstamptool -stopdependentjob -set_fault $fault_code $*
 
 echo stopping faulted jobs
-pstamptool -updatejob -state run -set_state stop -set_fault $fault_code -fault_count $fault_count $*
+pstamptool -updatejob -state run -set_state stop -set_fault $fault_code $*