Changeset 28609

Timestamp:

Jul 2, 2010, 6:35:13 PM (16 years ago)

Author:

watersc1

Message:

Re-enabled diff 30-day retention.

Added --this_mode_only to cleanup code so I can specify that I only want to cleanup one mode. "diff" for instance.

Location:

trunk

Files:

• ippScripts/scripts/automate_stacks.pl (modified) (8 diffs)
• ippconfig/recipes/nightly_science.config (modified) (1 diff)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -41 +41 @@
 # Grab options
 my ( $date, $camera, $dbname, $logfile, $verbose, $manual);
-my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $check_mode);
+my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $this_mode_only, $check_mode);
 my ( $check_registration, $define_burntool, $queue_burntool, $check_chips, $queue_chips);
 my ( $check_stacks, $queue_stacks, $check_diffs, $queue_diffs, $clean_old);
@@ -60 +60 @@
     'this_target_only=s'   => \$this_target_only,
     'this_filter_only=s'   => \$this_filter_only,
+    'this_mode_only=s'     => \$this_mode_only,
     'check_registration'   => \$check_registration,
     'define_burntool'      => \$define_burntool,
@@ -87 +88 @@
            --this_target_only     Process only a single target.
            --this_filter_only     Process only a single filter.
+           --this_mode_only       Process only a single clean mode.
         Modes:
            --check_registration   Confirm the data downloaded correctly.
@@ -130 +132 @@
 my %detfilter_list = ();
 my %detmax_list = ();
+my @mode_list = ();
 my %clean_commands = ();
 my %clean_retention = ();
@@ -152 +155 @@
             if (${ $mentry }{name} eq 'MODE') {
                 $this_mode = ${ $mentry }{value};
+                push @mode_list, $this_mode;
             }
             elsif (${ $mentry }{name} eq 'COMMAND') {
@@ -264 +268 @@
     }
     die("$this_filter_only is invalid.") if ($#filter_list != 0);
+}
+
+if (defined($this_mode_only)) {
+    foreach my $t (@mode_list) {
+        if ($t eq $this_mode_only) {
+            @mode_list = ($this_mode_only);
+            last;
+        }
+    }
+    die("$this_mode_only is invalid.") if ($#mode_list != 0);
 }
 
@@ -842 +856 @@
     }
     if (($metadata_out{nsState} eq 'CHECKDETRENDS') && ($exposures > 0)) {
-        $metadata_out{nsState} eq 'QUEUE_DETRENDS';
+        $metadata_out{nsState} eq 'QUEUEDETRENDS';
     }
 }
@@ -1043 +1057 @@
     my $pretend = shift;
 
-    foreach my $mode (sort (keys (%clean_commands))) {
+    foreach my $mode (@mode_list) {
         if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
             my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);

trunk/ippconfig/recipes/nightly_science.config

@@ -15 +15 @@
   MODE STR DIFF
   COMMAND STR difftool
-# RETENTION_TIME U16 30
-  RETENTION_TIME S16 -1
+  RETENTION_TIME S16 30
+#  RETENTION_TIME S16 -1
 END
 CLEAN_MODES METADATA
   MODE STR DIST
-  COMMAND STR disttool -
+  COMMAND STR disttool 
   RETENTION_TIME S16 7
   ALTERNATE_CMD STR A