Changeset 35791 for trunk/ippScripts

Timestamp:

Jul 10, 2013, 12:24:05 PM (13 years ago)

Author:

bills

Message:

if config file is missing and has no storage object don't raise error_cleaned error
Treat it the same way as a lost config file and cleanup the component anyways

File:

• trunk/ippScripts/scripts/ipp_cleanup.pl (modified) (4 diffs)

trunk/ippScripts/scripts/ipp_cleanup.pl

@@ -242 +242 @@
                     my $fault = $imfile->{fault};
 
-                    if (file_gone($config_file)) {
+                    if (file_gone($config_file) or !storage_object_exists($config_file)) {
                         # config file was lost. Clean up. If the chip is ever updated a new config
                         # file will be created
@@ -551 +551 @@
                     my $fault = $skyfile->{fault};
                     my $quality = $skyfile->{quality};
-                    if (file_gone($config_file)) {
+                    if (file_gone($config_file) or !storage_object_exists($config_file)) {
                         print STDERR "forcing cleanup warp $stage_id $skycell_id fault: $fault quality: $quality"
                             . " because config file ($config_file) is gone\n";
@@ -890 +890 @@
                     my $fault = $skyfile->{fault};
                     my $quality = $skyfile->{quality};
-                    if (file_gone($config_file)) {
+                    if (file_gone($config_file) or !storage_object_exists($config_file)) {
                         print STDERR "forcing cleanup diff $stage_id $skycell_id fault: $fault quality: $quality"
                             . " because config file ($config_file) is gone\n";
@@ -2389 +2389 @@
 }
 
+sub storage_object_exists {
+    my $filename = shift;
+    $nebulous_server = $ipprc->nebulous() if !$nebulous_server;
+    return $nebulous_server->storage_object_exists($filename);
+}
+
 # XXX we currently do not set the error state in the db on my_die
 sub my_die