Changeset 34903 for branches/eam_branches/ipp-20121219

Timestamp:

Jan 10, 2013, 11:34:33 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/Makefile.in (modified) (1 diff)
• ippMonitor/raw/czartool_labels.php (modified) (1 diff)
• ippMonitor/raw/site.php.in (modified) (2 diffs)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/ipp_cleanup.pl (modified) (9 diffs)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)
• tools/czarcal (modified) (1 diff)

branches/eam_branches/ipp-20121219/ippMonitor/Makefile.in

@@ -215 +215 @@
 $(DESTWWW)/simplePlotStackImage.php \
 $(DESTWWW)/simplePlotStaticskyImage.php \
+$(DESTWWW)/newsimplePlotStaticskyImage.php \
 $(DESTWWW)/simplePlotSkycalImage.php \
 $(DESTWWW)/histogramBackgroundImage.php \

branches/eam_branches/ipp-20121219/ippMonitor/raw/czartool_labels.php

@@ -169 +169 @@
 echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=mem_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">mem_report</font></a></td></tr>";
-echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/top.html\"><font color=\"blue\">here</font></a> <a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor2\"><font color=\"blue\">new</font></td></tr>";
+echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/index.php\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Files monitor</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/diskMonitor\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp0022.ifa.hawaii.edu/ps1sc/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";

branches/eam_branches/ipp-20121219/ippMonitor/raw/site.php.in

@@ -30 +30 @@
 $REPL_USER_NEBULOUS = "ippMonitor";
 $REPL_PASSWORD_NEBULOUS = "ippMonitor";
-$REPL_DBNAME_NEBULOUS = "ippdb02 (nebulous)";
+$REPL_DBNAME_NEBULOUS = "ippdb02 (nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays for backups)";
 
 $REPL_HOST_PSTAMP = "ippc19.IfA.Hawaii.Edu";
@@ -50 +50 @@
 $REPL_USER_NEBULOUS_SECONDARY = "ippMonitor";
 $REPL_PASSWORD_NEBULOUS_SECONDARY = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_SECONDARY = "ippdb04 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";
-
-$REPL_HOST_NEBULOUS_TERNARY = "ippc63.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS_TERNARY = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS_TERNARY = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_TERNARY = "ippc63 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";
-
+$REPL_DBNAME_NEBULOUS_SECONDARY = "ippdb04 (secondary nebulous)";
 
 ?>

branches/eam_branches/ipp-20121219/ippScripts/scripts/ipp_cleanup.pl

@@ -203 +203 @@
     # loop over all of the imfiles, determine the path_base and class_id for each
     my $num_errors = 0;
+    my $num_updated = 0;
     foreach my $imfile (@$imfiles) {
         my $class_id = $imfile->{class_id};
@@ -323 +324 @@
                 }
                 set_destreak_goto_cleaned();
+                $num_updated++;
             }
         } else {
@@ -351 +353 @@
         }
     }
-    print "Cleanup completed for chip_id $stage_id.";
+    if ($num_updated eq 0 and $num_errors eq 0) {
+        # no chips were updated by this procedssing so set state to $done_state
+        my $command = "$chiptool -chip_id $stage_id -updaterun -set_state $done_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
+        }
+    }
+    print "Cleanup completed for chip_id $stage_id. num_updated: $num_updated";
     print " num_errors: $num_errors" if $num_errors;
     print "\n";
@@ -497 +511 @@
     my @files = ();
     my $num_errors = 0;
+    my $num_updated = 0;
     foreach my $skyfile (@$skyfiles) {
         my $path_base = $skyfile->{path_base};
@@ -599 +614 @@
 
                 set_destreak_goto_cleaned();
+                $num_updated++;
             }
 
@@ -625 +641 @@
         }
     }
-    print "Cleanup completed for warp_id $stage_id.";
-    print " num_errors: $num_errors" if $num_errors;
+    if ($num_updated eq 0 and $num_errors eq 0) {
+        # no skycells were updated by this procedssing so set state to $done_state
+        my $command = "$warptool -warp_id $stage_id -updaterun -set_state $done_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform warptool: $error_code", "warp", $stage_id, $error_code);
+        }
+    }
+    print "Cleanup completed for warp_id $stage_id. num_updated: $num_updated";
+    print " num_errors:  $num_errors" if $num_errors;
     print "\n";
     exit 0;
@@ -802 +830 @@
 
     my $num_errors = 0;
+    my $num_updated = 0;
     my @files = ();
     foreach my $skyfile (@{ $skyfiles }) {
@@ -926 +955 @@
                 }
                 set_destreak_goto_cleaned();
+                $num_updated++;
             }
 
@@ -953 +983 @@
         }
     }
-    print "Cleanup completed for diff_id $stage_id.";
+    if ($num_updated eq 0 and $num_errors eq 0) {
+        # no skycells were updated by this procedssing so set state to $done_state
+        my $command = "$difftool -diff_id $stage_id -updaterun -set_state $done_state";
+        $command .= " -dbname $dbname" if defined $dbname;
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform difftool: $error_code", "diff", $stage_id, $error_code);
+        }
+    }
+    print "Cleanup completed for diff_id $stage_id. num_updated: $num_updated";
     print " num_errors: $num_errors" if $num_errors;
     print "\n";

branches/eam_branches/ipp-20121219/tools/czarcal

@@ -23 +23 @@
 my @staff = qw(
 mark
-serge
+gene
+bill
+heather
 chris
-gene
-heather
-bill
 );