Changeset 28147

Timestamp:

May 27, 2010, 1:41:26 PM (16 years ago)

Author:

bills

Message:

postage stamp server changes from the trunk to work around problem reported in ticket 1388

Location:

tags/ipp-20100525

Files:

• PS-IPP-PStamp (modified) (1 prop)
• ippTools (modified) (1 prop)
• ippTools/share/pstamptool_getdependent.sql (modified) (1 diff)
• ippTools/share/pstamptool_revertdependent.sql (modified) (1 diff)
• ippTools/src/pstamptool.c (modified) (6 diffs)
• pstamp (modified) (1 prop)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 diff)
• pstamp/scripts/pstampparse.pl (modified) (1 diff)
• pstamp/src/pstamp.h (modified) (1 diff)

tags/ipp-20100525/ippTools/share/pstamptool_getdependent.sql

@@ -1 +1 @@
 SELECT DISTINCT pstampDependent.*
 FROM pstampDependent
--- JOIN pstampJob USING(dep_id)
--- JOIN pstampRequest USING(req_id)
 WHERE pstampDependent.state = 'new'

tags/ipp-20100525/ippTools/share/pstamptool_revertdependent.sql

@@ -4 +4 @@
 SET pstampDependent.fault = 0
 WHERE pstampDependent.state = 'new'
+    AND (pstampDependent.fault > 0)

tags/ipp-20100525/ippTools/src/pstamptool.c

@@ -30 +30 @@
 #include "pxdata.h"
 #include "pstamptool.h"
+#include "pstamp.h"
 
 static bool adddatastoreMode(pxConfig *config);
@@ -941 +942 @@
     PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
 
-    // By default only revert faults < 10 which are our "ipp exit codes"
+    // By default only revert faults < PSTAMP_FIRST_ERROR_CODE which are our "ipp exit codes"
     // codes larger than that are the pstamp request interface.
     // Don't fault those unless -fault waa provided
-    psString faultClause = "";
+    psString faultClause = psStringCopy("");
     if (!fault) {
-        faultClause = " \nAND (pstampJob.fault < 10)";
+        psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
     }
 
@@ -963 +964 @@
 
     if (!p_psDBRunQueryF(config->dbh, query, faultClause)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
+        psFree(faultClause);
+        psFree(query);
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    psFree(faultClause);
 
     return true;
@@ -1135 +1140 @@
             psFree(output);
             return false;
+        }
+        psS32 fault = psMetadataLookupS64(NULL, dep, "fault");
+        if (fault > 0) {
+            fprintf(stderr, "existing dependent has fault %d\n", fault);
+            exit (fault);
         }
         printf("%" PRId64 "\n", dep_id);
@@ -1317 +1327 @@
         return false;
     }
+
+    PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);
+
     psString query = pxDataGet("pstamptool_revertdependent.sql");
     if (!query) {
@@ -1328 +1341 @@
     psFree(where);
 
+    if (!fault) {
+        // unless asked to clear a specific fault value, restrict reverts to fault codes
+        // that are less than the minimum fault in the API
+        psStringAppend(&query, " AND (pstampDependent.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");

tags/ipp-20100525/pstamp/scripts/pstamp_checkdependent.pl

@@ -307 +307 @@
             # ... and fault the dependent so that we have a record of the error
             my_die("failed to find warpSkyCelllMap for warpRun $warp_id skycell_id $skycell_id",
-                $PS_EXIT_DATA_ERROR);
+                $PSTAMP_GONE);
         }
 

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

@@ -829 +829 @@
             run(command => $command, verbose => $verbose);
         unless ($success) {
-            my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);
-        }
-        my $output = join "", @$stdout_buf;
-        chomp $output;
-        $dep_id = $output;
-        #
-        # XXX: need to fault the request or something
-        my_die("pstamptool -getdependent returned invalid dep_id", $PS_EXIT_PROG_ERROR) if !$dep_id;
+            my $fault = $error_code >> 8;
+            print STDERR "$command failed with fault $fault\n";
+            if ($fault >= 10) {
+                $$r_dep_id = 0;
+                $$r_fault = $fault;
+                $$r_jobState = 'stop';
+                return;
+            }
+            # for now just die. Later pstamptool will return the whole dependent so we can
+            # examine the fault code
+            my_die("$command failed with unexpected fault value: $fault", $PS_EXIT_UNKNOWN_ERROR);
+        } else {
+            my $output = join "", @$stdout_buf;
+            chomp $output;
+            $dep_id = $output;
+            #
+            # XXX: need to fault the request or something
+            my_die("pstamptool -getdependent returned invalid dep_id", $PS_EXIT_PROG_ERROR) if !$dep_id;
+        }
     } else {
         print STDERR "skipping $command\n";

tags/ipp-20100525/pstamp/src/pstamp.h

@@ -9 +9 @@
 typedef enum {
         PSTAMP_SUCCESS          = 0,
+        PSTAMP_FIRST_ERROR_CODE = 10,
         PSTAMP_SYSTEM_ERROR     = 10,
         PSTAMP_NOT_IMPLEMENTED  = 11,