Changeset 40055 for trunk/ippMonitor/czartool/czarpoll.pl

Timestamp:

May 24, 2017, 2:55:55 PM (9 years ago)

Author:

watersc1

Message:

Update to czartool to populate summit/download/new/raw Exp tables, and plot those results with the other stages. Fixes bug that allowed plot temp files to remain undeleted

File:

• trunk/ippMonitor/czartool/czarpoll.pl (modified) (5 diffs)

trunk/ippMonitor/czartool/czarpoll.pl

@@ -63 +63 @@
         "fullforce",
         "dist",
-        "pub");
+        "pub",
+        "summitExp",
+        "downloadExp",
+        "newExp",
+        "rawExp");
+
+
 
 my @ippToPspsStages = (
@@ -274 +280 @@
         }
 
+        my @trashFiles = </tmp/czarplot_gnuplot_*>;
+        if ($#trashFiles != -1) { 
+            print "* WARNING: Cleaning " . ($#trashFiles + 1) . " files that were not auto cleaned.\n";
+            foreach my $tFile (@trashFiles) {
+                unlink($tFile);
+            }
+        }
+
         my $iterationTime = time() - $iterationStartTime;
 
@@ -350 +364 @@
         # skip update labels for now. The plots are not relevant.
         next if $label =~ 'ps_ud';
+        # Skip individual label tables for raw-like stages.
+#       if ($stage =~ /Exp/) { next; } 
 
         $plotter->createTimeSeries($label, undef, $begin, $end, 1, 1, 1);
@@ -390 +406 @@
 
     foreach $stage (@stages) {
-
         $server = $pantasks->getServerForThisStage($stage);
         $pantasks->getRevertStatus($stage, \$reverting);
@@ -396 +411 @@
 
         print "* Checking labels for $stage stage\n";
+
+        # These have no labels to check, so just get them out of the way fast
+        if (($stage eq 'summitExp')||($stage eq 'downloadExp')||($stage eq 'newExp')||($stage eq 'rawExp')) { 
+            ($new,$full,$faults) = $gpc1Db->countRawExposures($today,$stage);
+            $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc1', $new, $full, $faults);
+
+            ($new,$full,$faults) = $gpc2Db->countRawExposures($today,$stage);
+            $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc2', $new, $full, $faults);
+
+            next;
+        }
+
 
         $totalNew1=$totalFaults1=$totalFull1=0;