Changeset 34255

Timestamp:

Jul 31, 2012, 3:51:23 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/czartool/czarplot.pl (modified) (7 diffs)
• ippMonitor/czartool/czarpoll.pl (modified) (10 diffs)
• ippMonitor/czartool/czartool/Plotter.pm (modified) (1 diff)
• ippMonitor/raw/czartool_getplot.php (modified) (1 diff)
• ippMonitor/raw/czartool_labels.php (modified) (1 diff)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (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/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psconfig/psconfig.csh.in (modified) (2 diffs)
• psconfig/tagsets/ipp-3.0.dist (modified) (1 diff)
• 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)

branches/eam_branches/ipp-20120627/ippMonitor/czartool/czarplot.pl

@@ -61 +61 @@
     print "* OPTIONAL: plot histogram                  -h                          (default=off)\n";}
 if (!$timeSeries) {
-    print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";} 
+    print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";}
 if (!$magicMask) {
-    print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";} 
+    print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";}
 if (!$exposureId) {
-    print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";} 
+    print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";}
 if (!$rate) {
-    print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";} 
+    print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";}
 if (!$log) {
     $log = 0;
     print "* OPTIONAL: use log plots                   -g                          (default=$log)\n";}
 if (!$nebulous) {
-    print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";} 
+    print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";}
 if (!$label) {
     $label = "all_stdscience_labels";
@@ -79 +79 @@
     print "* OPTIONAL: choose a stage                  -s <chip|cam|warp|etc>      (default=none)\n";}
 if (!$timeinpast) {
-    print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";} 
+    print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";}
 if (!$rateInterval) {
-    print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";} 
+    print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";}
 if (!$begin) {
-    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";} 
+    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";}
 if (!$end) {
-    print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";} 
+    print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";}
 if (!$day) {
-    print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";} 
+    print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";}
 if (!$path) {
     print "* OPTIONAL: choose an output location       -o <path>                   (default=none)\n";
-} 
+}
 if (!$psps) {
-    print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";} 
+    print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";}
 print "*\n*******************************************************************************\n";
 
@@ -110 +110 @@
 my $newDayTime =  $config->getMetricsStartTime();
 
-my $plotter = undef; 
+my $plotter = undef;
 if ($savingToFile) {
 
@@ -122 +122 @@
 if ($psps) {$plotter->setIppToPspsMode();}
 
-# if a single day has been chosen 
+# if a single day has been chosen
 if($day) {
 
@@ -134 +134 @@
         # plots should span 24 housr from previous day
         my $dayBefore = $czarDb->subtractInterval($day, "1 DAY");
-                
+
         $begin = "$dayBefore $newDayTime";
         $end = "$day $newDayTime";
@@ -147 +147 @@
         my $yesterday = $czarDb->subtractInterval($today, "1 DAY");
 
-        
+
         if ($timeinpast) {$begin = $czarDb->subtractInterval($end, $timeinpast);}
         elsif ($czarDb->isBefore($end, "$today $newDayTime")) {$begin = "$yesterday $newDayTime";}
@@ -166 +166 @@
 
 if ($histogram) {$plotter->createHistogram($label, $begin, $end);}
-if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}
-elsif ($nebulous) {$plotter->plotDiskUsageHistogram();}
+if ($nebulous && $timeSeries) {
+    $plotter->plotStorageTimeSeries($begin, $end);
+}
+elsif ($nebulous) {
+    $plotter->plotDiskUsageHistogram();
+    $plotter->plotDiskUsageHistogramLarge();
+}
 if ($magicMask) {
 

branches/eam_branches/ipp-20120627/ippMonitor/czartool/czarpoll.pl

@@ -30 +30 @@
 
 my $config = new czartool::Config();
-my $czarDb = $config->getCzarDbInstance(); 
+my $czarDb = $config->getCzarDbInstance();
 my $gpc1Db = $config->getGpc1Instance;
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
-my $plotter = czartool::Plotter->new_file($config, $config->getGnuplotPath(), $save_temps); 
+my $plotter = czartool::Plotter->new_file($config, $config->getGnuplotPath(), $save_temps);
 
 
 my @stages = (
-        "chip", 
-        "cam", 
-        "fake", 
-        "warp", 
-        "stack", 
-        "staticsky", 
-        "diff", 
-        "dist", 
+        "chip",
+        "cam",
+        "fake",
+        "warp",
+        "stack",
+        "staticsky",
+        "diff",
+        "dist",
         "pub",
         "chipbackground");
@@ -65 +65 @@
 ###########################################################################
 #
-# Updates the dates from pantasks for all interested servers 
+# Updates the dates from pantasks for all interested servers
 #
 ###########################################################################
@@ -78 +78 @@
 
         my @dates = @{$pantasks->getDates($server)};
-        if (@dates) { 
+        if (@dates) {
 
             $czarDb->updateServerDates($server, \@dates);
@@ -91 +91 @@
 ###########################################################################
 #
-# Updates the labels from pantasks for all interested servers 
+# Updates the labels from pantasks for all interested servers
 #
 ###########################################################################
@@ -103 +103 @@
 
         my @labels = @{$pantasks->getLabels($server)};
-        if (@labels) { 
+        if (@labels) {
 
             $czarDb->updateCurrentLabels($server, \@labels);
@@ -116 +116 @@
 ###########################################################################
 #
-# Updates pantasks server status TODO should really get info for all servers at once 
+# Updates pantasks server status TODO should really get info for all servers at once
 #
 ###########################################################################
@@ -136 +136 @@
 ###########################################################################
 #
-# Polls with provided period (seconds) 
+# Polls with provided period (seconds)
 #
 ###########################################################################
@@ -184 +184 @@
                 # create metrics for last 24 hours
                 print "* Creating metrics for last 24 hours\n";
-                my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $today); 
+                my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $today);
                 $dayMetrics->writeHTML();
 
                 # now update metrics index page
-                my $metricsIndex = new czartool::MetricsIndex($config, 1, 0); 
+                my $metricsIndex = new czartool::MetricsIndex($config, 1, 0);
                 $metricsIndex->writeHTML();
 
@@ -210 +210 @@
         $plotter->plotStorageTimeSeries($czarDb->subtractInterval($begin, "1 WEEK") , $end);
         $plotter->plotDiskUsageHistogram();
+        $plotter->plotDiskUsageHistogramLarge();
         updateServerStatus();
 
@@ -269 +270 @@
     $czarDb->getCurrentIppToPspsLabels($begin, $end, \$ippToPspsLabels);
     $plotter->setIppToPspsMode();
-    
+
     # create ippToPsps labels
     foreach $stage (@ippToPspsStages) {
         foreach $row ( @{$ippToPspsLabels} ) {
             my ($label) = @{$row};
-            
+
             chomp($label);
             $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 0, 1);

branches/eam_branches/ipp-20120627/ippMonitor/czartool/czartool/Plotter.pm

@@ -666 +666 @@
         "set title \"Nebulous disk use across IPP cluster ($totalPercent of total allocated)\";" .
         "set style fill solid 1.00 border -1;" .
+        "set key center top;" .
+        "set style histogram rowstacked;" .
+        "set style data histograms;" .
+        "set ylabel \"Space (TB)\";" .
+        "set xtic rotate by -90 scale 0;" .
+        "plot '".$tmpFile->filename."' " .
+        "using 2:xtic(1) t \"Used\" lt 7," .
+        "'' using 3 t \"Over $limit% used\" lt 1," .
+        "'' using 4 t \"Unavailable\" fs solid 0.50 lt -1 ," .
+        "'' using 5 t \"Free\" lt 2," .
+        "'' using 6 notitle fs solid 0.50 lt -1" .
+        ";" .
+
+        "\n";
+    close GP;
+}
+
+###########################################################################
+#
+# Plots disk usage across cluster as a stacked histogram
+#
+###########################################################################
+sub plotDiskUsageHistogramLarge {
+    my ($self) = @_;
+
+    my $prefix = $self->{_outputPath} ? $self->{_outputPath} : "."; # TODO should be function for this
+        my $outputFile = "$prefix/czarplot_hosts_space_large.png";
+    my $limit = 97.0;
+    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_hosts_space.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
+    $self->{_czarDb}->createHostsData($limit, $tmpFile);
+
+    my $totalUsed = $self->{_czarDb}->getTotalClusterStorageAsPercentage();
+
+    my $totalPercent = sprintf("%.1f%%", $totalUsed);
+
+    open (GP, "|$GNUPLOT -persist") or die "no gnuplot";
+    use FileHandle;
+    GP->autoflush(1);
+
+    if ($self->{_outputFormat} ne "X11") {print GP "set output \"$outputFile\";";}
+    print GP
+        "set term $self->{_outputFormat} size 1280,1024;" .
+        "set title \"Nebulous disk use across IPP cluster ($totalPercent of total allocated)\";" .
+        "set style fill solid 1.00 border -1;" .
+        "set bmarg 5; " .
         "set key center top;" .
         "set style histogram rowstacked;" .

branches/eam_branches/ipp-20120627/ippMonitor/raw/czartool_getplot.php

@@ -28 +28 @@
 else if ($type=="s")
 $filePath = "$path/czarplot_hosts_space.png";
+else if ($type=="sl")
+$filePath = "$path/czarplot_hosts_space_large.png";
 else if ($type=="st")
 $filePath = "$path/czarplot_cluster.png";

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

@@ -141 +141 @@
  # storage plot
 echo "<br>";
- echo "<img src=\"czartool_getplot.php?type=s\"><br>";
+ echo "<a href=\"czartool_getplot.php?type=sl\"><img title=\"Click to enlarge me\" src=\"czartool_getplot.php?type=s\"></a><br>";
  # storage timeseries
 echo "<br>";

branches/eam_branches/ipp-20120627/psconfig/psconfig.csh.in

@@ -319 +319 @@
  case linux:
  case linrh:
-   gcc --version | grep 4.6.3 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"
@@ -331 +331 @@
  case lin64:
  case linrh64:
-   gcc --version | grep 4.6.3 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"

branches/eam_branches/ipp-20120627/psconfig/tagsets/ipp-3.0.dist

@@ -64 +64 @@
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
+# YYYYY  ippToPsps              ipp-2-9          -0
           
   YYYYY  ippconfig              ipp-2-9          -0