Changeset 35380

Timestamp:

Apr 9, 2013, 11:36:27 AM (13 years ago)

Author:

bills

Message:

if request with WEB.UP label has more than 500 rows or generates
more than 500 jobs, set label to WEB.BIG

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (6 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -189 +189 @@
 
 #
-# now convert the request table to an array of metadata config docs
+# now convert the request table to an array of metadatas
 #
 
@@ -206 +206 @@
     my $dtime_request_file = gettimeofday() - $start_request_file;
     print "Time to read and parse request file: $dtime_request_file\n";
-
-}
+}
+
+my $nRows = scalar @$rows;
+print "\n$nRows rows read from request file\n";
+
+# If this is a big request and it came from the upload page and doesn't have a specific label assigned
+# change it to the generic one that has lower with lower priority
 
 #
 # Loop over rows in the request file collecting consecutive rows that have the "same images of interest"
-# in the sense that their selection parameters will yield the same "Runs".
+# in the sense that their selection parameters will yield the same target "Runs".
 # Process the groups of rows together to reduce lookup time and to potentially make multiple
 # stamps from the same ppstamp process.
-#
+
 my @rowList;
 my $num_jobs = 0;
@@ -221 +226 @@
 my $need_magic;
 foreach my $row (@$rows) {
-    # santiy check the paramaters
+    if ($label eq 'WEB.UP' and ($nRows > 500 or $num_jobs > 500) and $req_id and !$no_update) {
+        $label = 'WEB.BIG';
+        print "\nChanging label for big WEB.UP request to $label\n";
+
+        my $command = "$pstamptool -updatereq -req_id $req_id  -set_label $label";
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);
+        }
+    }
+    # sanity check the paramaters
     if (!checkRow($row)) {
         # when it enconters an error checkRow adds a fake job with an appropriate error code to the database
@@ -931 +947 @@
     $command .= ' -hold' if $action eq 'PREVIEW';
 
-    # compute rlabel for the run.
-    # XXX: This bit of policy shouldn't be buried so deeply in the code
-    # For now use one that implies 'postage stamp server' 'update' 'request_label"
-    my $rlabel = "ps_ud_" . $label if $label;
-    $command .= " -rlabel $rlabel" if $rlabel;
+    if ($label) {
+        # compute rlabel for the run.
+        # XXX: This bit of policy shouldn't be buried so deeply in the code
+        # For now use one that implies 'postage stamp server' 'update' 'request_label"
+        my $rlabel = "ps_ud_" . $label;
+        $command .= " -rlabel $rlabel";
+    }
 
     if (!$no_update) {
@@ -943 +961 @@
             my $fault = $error_code >> 8;
             print STDERR "$command failed with fault $fault\n";
-            if ($fault < 10) {
+            if ($fault < $PSTAMP_FIRST_ERROR_CODE) {
                 # pstamptool returns an error if an existing depenent is faulted
-                # Set the object to not available even if the fault < 10
+                # Set the object to not available even if the fault < $PSTAMP_FIRST_ERROR_CODE
                 # which is nominally a recoverable error in order to keep
                 # the request from faulting (which can be very expensive if
@@ -951 +969 @@
                 $fault = $PSTAMP_NOT_AVAILABLE
             }
-            if ($fault >= 10) {
+            if ($fault >= $PSTAMP_FIRST_ERROR_CODE) {
                 $$r_dep_id = 0;
                 $$r_fault = $fault;