Changeset 40387 for trunk

Timestamp:

Apr 11, 2018, 2:15:43 PM (8 years ago)

Author:

watersc1

Message:

Allow chip updates to regenerate files when the current copy only exists on permanently gone volumes.

Location:

trunk

Files:

• Nebulous/bin/whichnode (modified) (2 diffs)
• ippScripts/scripts/chip_imfile.pl (modified) (3 diffs)

trunk/Nebulous/bin/whichnode

@@ -31 +31 @@
 my $dbh = getDBHandle();
 
-my $query = "SELECT  volume.name AS volname, uri, mountedvol.*"
+my $query = "SELECT  volume.name AS volname, uri, mountedvol.*, volume.xattr AS volxattr"
     . " FROM storage_object JOIN instance USING(so_id)"
     . " JOIN volume using(vol_id)"
@@ -53 +53 @@
         my $volname = $instance->{volname};
         my $uri = $instance->{uri};
+        my $volxattr = $instance->{volxattr};
+        
         $num_instances++;
         if ($instance->{available}) {
             $num_available++;
             print "$volname available\n";
+        } elsif ($volxattr == 5) {
+            print "$volname permanently offline\n";
         } else {
             print "$volname not available\n";

trunk/ippScripts/scripts/chip_imfile.pl

@@ -632 +632 @@
                 if ($gone) {
                     carp "WARNING: photometry sources storage object exists but all instances are permanently gone";
+                    $ipprc->file_rename($outputSources,$outputSources . ".gone");
                     $make_sources = 1;
                 }
@@ -657 +658 @@
             if ($gone) {
                 carp "WARNING: PSF storage object exists but all instances are permanently gone";
+                $ipprc->file_rename($outputPsf,$outputPsf . ".gone");
                 $make_psf = 1;
             }
@@ -742 +744 @@
             print STDERR "$file is on $volume which is gone\n";
             $numGone++;
+        } elsif ($answer eq 'permanently') {
+            $numGone++;
         } elsif ($answer eq 'available') {
             $numNotGone++;