Changeset 27517 for branches/eam_branches/20100225/pstamp/scripts/pstamp_queue_requests.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_queue_requests.pl (modified) (9 diffs)

branches/eam_branches/20100225/pstamp/scripts/pstamp_queue_requests.pl

@@ -19 +19 @@
 my $dbserver;
 my $limit;
+my $timeout = 10;
 
 GetOptions(
+    'timeout=i'     =>  \$timeout,
     'verbose'       =>  \$verbose,
     'dbname=s'      =>  \$dbname,
@@ -69 +71 @@
 
 my @dataStores;
-#Look up the list of data stores to monitor
+#Look up the list of data stores that are ready to be queried
 {
-    my $command = "$pstamptool -datastore";
+    my $command = "$pstamptool -datastore -ready";
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
@@ -83 +85 @@
 
     if (@$stdout_buf == 0) {
-        print STDERR "no data stores registered\n" if $verbose;
+        print STDERR "no data stores ready\n" if $verbose;
         exit 0;
     }
@@ -111 +113 @@
     my $outProduct = $ds->{outProduct};
     my $ds_id = $ds->{ds_id};
+    my $ds_label = $ds->{label};
+    $ds_label = undef if $ds_label eq "NULL";
     my @lines;
     {
         my $command = "$dsproductls --uri $ds->{uri}/index.txt";
         $command .= " --last_fileset $ds->{lastFileset}" if $ds->{lastFileset};
+        $command .= " --timeout $timeout";
 
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -124 +129 @@
             # don't die on "common faults"
             # perhaps after some number of these we should mark the data store as disabled
-            next if ($exit_status == 200);  # 500 cannot connect (data store down)
-            next if ($exit_status == 104);  # 404 not found
-#            next if ($exit_status == 100);  # 400 bad request
+            if (($exit_status == 200) or ($exit_status == 104)) {
+                ## now update the last_fileset column in pstampDataStore
+                update_ds_timestamp($ds_id, $dbname, $dbserver);
+                next;
+            }
+
 
             die("Unable to perform $command: $error_code");
@@ -133 +141 @@
         if (@$stdout_buf == 0) {
             print STDERR "no new request files in data store $ds_id\n" if $verbose;
+            update_ds_timestamp($ds_id, $dbname, $dbserver);
             next; # next data store
         }
@@ -184 +193 @@
             {
                 my $command = "$pstamptool -addreq -uri $req_uri -ds_id $ds_id";
+                $command .= " -label $ds_label" if $ds_label;
                 $command .= " -dbname $dbname" if $dbname;
                 $command .= " -dbserver $dbserver" if $dbserver;
@@ -199 +209 @@
         {
         ## now update the last_fileset column in pstampDataStore
-        my $command = "$pstamptool -ds_id $ds_id -moddatastore -last_fileset $lastFileset";
+        my $command = "$pstamptool -ds_id $ds_id -moddatastore -set_last_fileset $lastFileset";
         $command .= " -dbname $dbname" if $dbname;
         $command .= " -dbserver $dbserver" if $dbserver;
@@ -213 +223 @@
 
 exit 0;
+
+sub update_ds_timestamp {
+    my $ds_id = shift;
+    my $dbname = shift;
+    my $dbserver = shift;
+
+    my $command = "$pstamptool -ds_id $ds_id -moddatastore -update_timestamp";
+                $command .= " -dbname $dbname" if $dbname;
+                $command .= " -dbserver $dbserver" if $dbserver;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        die("Unable to perform pstamptool -moddatastore: $error_code");
+    }
+}