Changeset 40476

Timestamp:

Jun 27, 2018, 3:17:00 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/tools

Files:

• . (modified) (1 prop)
• diskspace/rework/result2size.pl (modified) (2 diffs)
• fix.ws.nightlyscience (copied) (copied from trunk/tools/fix.ws.nightlyscience )
• regpeek.pl (modified) (2 diffs)
• seed_summitExp.pl (copied) (copied from trunk/tools/seed_summitExp.pl )
• stsci_disks/p4_restore.pl (modified) (5 diffs)

branches/czw_branch/20170908/tools/diskspace/rework/result2size.pl

@@ -1 @@
-#! /usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 my %sizes = (
@@ -114 +114 @@
 %counts_full = ();
 %counts_total = ();
+
+foreach my $stage_name ('raw','chip','chip_lies','cam','warp','warp_lies','diff','diff_lies','stack','ssky','skycal','ff') {
+    $sums{$stage_name} = 0;
+    $counts_full{$stage_name} = 0;
+    $counts_total{$stage_name} = 0;
+}
+
 while (<>) {
     chomp;

branches/czw_branch/20170908/tools/regpeek.pl

@@ -21 +21 @@
 }
 print "Date: $date\n";
-print "CMD: regtool -checkstatus -date $date -class_id ota33 -dbname gpc1 -simple\n";
-chomp(my $bad_exp = `regtool -checkstatus -date $date -class_id ota33 -dbname gpc1 -simple | grep 'stop run' | head -1`);
+print "CMD: regtool -checkstatus -date $date -class_id ota33 -dbname $dbname -simple\n";
+chomp(my $bad_exp = `regtool -checkstatus -date $date -class_id ota33 -dbname $dbname -simple | grep 'stop run' | head -1`);
 my @row = split /\s+/, $bad_exp;
 if ($#row == 18) {
@@ -49 +49 @@
     print "$exp_name  $class_id $bt_state $data_state $uri\t";
     if (($bt_state > -10)&&($data_state eq 'check_burntool')) {
-        print "#??? regtool -updateprocessedimfile -exp_id $exp_id -class_id $class_id -set_state pending_burntool -dbname gpc1";
+        print "#??? regtool -updateprocessedimfile -exp_id $exp_id -class_id $class_id -set_state pending_burntool -dbname $dbname";
     }
     print "\n";

branches/czw_branch/20170908/tools/stsci_disks/p4_restore.pl

@@ -29 +29 @@
 
 my (    $db, $dbhost, $dbpass, $dbuser);
-my $conffile = "/home/panstarrs/ipp/ippconfig/nebulous.config";
+#my $conffile = "/home/panstarrs/ipp/ippconfig/nebulous.config";
+my $conffile = '/data/ippc64.1/ippitc/ippconfig/nebulous.config';
+
 if (-e $conffile) {
 #    printf STDERR "found config\n";
@@ -53 +55 @@
 
 pod2usage( -msg => "Cannot configure nebulous database", -exitval => 2) unless
-    defined $host && defined $volume && defined $dir && 
+    defined $host && defined $volume && defined $dir &&
     defined $db && defined $dbhost && defined $dbuser && defined $dbpass;
 
@@ -71 +73 @@
 my $time = time();
 
-my $dbh = DBI->connect(
-    "DBI:mysql:database=$db:host=$dbhost",
-    $dbuser,
-    $dbpass,
-    {
-        RaiseError => 1,
-        PrintError => 0,
-        AutoCommit => 1,
-    },
-    );
+
+#$dbhost = '166.122.172.39';
+#my $dbport = '3308';
+#my $dbh = DBI->connect(
+#     "DBI:mysql:database=$db:host=$dbhost:port=$dbport",
+#     $dbuser,
+#     $dbpass,
+#     {
+#         RaiseError => 1,
+#         PrintError => 0,
+#         AutoCommit => 1,
+#     },
+#     );
+use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
+
+my $dbh = DBI->connect("DBI:mysql:database=${db};host=${dbhost};" .
+                       "mysql_socket=" . DB_SOCKET(),
+                       ${dbuser},${dbpass},
+                       { RaiseError => 1, AutoCommit => 1}
+    ) or die "Unable to connect to database $DBI::errstr\n";
 
 
-my $logDest = "neb://any/stsci_shuffle/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+my $logDest = "/export/${host}.${volume}/retire_rsync/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+
+#if ((${host} eq 'ippb04')&&($volume == 2)) {
+#    $logDest = "/export/${host}.0/stsci_shuffle/restore/${host}.${volume}/${source}.${volume}/${dir}.log.${time}";
+#}
+
 my $ipprc = PS::IPP::Config->new( "GPC1" ) or die "Could not create config object.\n";
 $ipprc->redirect_output($logDest) or die "Could not redirect output to logfile ${logDest}\n";
 
-my $root = "/export/${host}.${volume}/stsci_shuffle/${source}.${source_vol}/nebulous/${dir}";
+my $root = "/export/${host}.${volume}/retire_rsync/data/${source}.${source_vol}/nebulous/${dir}";
 my @subdirectories = <$root/*>;
 
@@ -113 +130 @@
 
     my $destination_subdir = $subdir;
-    $destination_subdir =~ s%/stsci_shuffle/${source}.${source_vol}/nebulous%/nebulous%;
+    $destination_subdir =~ s%/retire_rsync/data/${source}.${source_vol}/nebulous%/nebulous%;
 
     my @files = <${subdir}/*>;
@@ -121 +138 @@
     print "LOG BEGIN $subdir $time $dtime\n";
     for (my $i = 0; $i <= $#files; $i++) {
-        my $f = $files[$i];
+        my $f = $files[$i];
         my ($ins_id);
         $ins_id = $f;
         $ins_id =~ s/^$subdir\///;
         $ins_id =~ s/\..*//;
-        
-        # Write log of what we plan to do.
-        my $destination_f = $f;
-        $destination_f =~ s%/stsci_shuffle/${source}.${source_vol}/nebulous%/nebulous%;
-        
-        my $db_uri = $destination_f;
-        $db_uri =~ s%^/export/%/data/%;
-        $db_uri = 'file://' . $db_uri;
 
-        print "$ins_id $f $destination_f $db_uri\n";
+        # Write log of what we plan to do.
+        my $destination_f = $f;
+        $destination_f =~ s%/retire_rsync/data/${source}.${source_vol}/nebulous%/nebulous%;
 
-#       die;
+        my $db_uri = $destination_f;
+        $db_uri =~ s%^/export/%/data/%;
+        $db_uri = 'file://' . $db_uri;
 
-        # Do move of file.
-        if (-e $destination_f) {
-            print "FILE ALREADY FOUND\n";
-            next;
-        }
+        print "$ins_id $f $destination_f $db_uri\n";
 
-        my $validate_ins_id_query = "SELECT * FROM instance WHERE vol_id = ${source_vol_id} AND ins_id = ${ins_id}";
-        my @instances = $dbh->selectall_arrayref( $validate_ins_id_query );
-        if ($#instances != 0) { # We expect one instance on the source
-            print "NO DB ENTRY\n";
-            next;
-        }
-#       print "PASSED DB CHECK: $#instances\n";
-#       system("stat ${f}");
-        system("mv ${f} ${destination_f}");
-#       system("stat ${destination_f}");
+#       die;
 
-        # Register database change:
+        # Do move of file.
+        if (-e $destination_f) {
+            print "FILE ALREADY FOUND\n";
+            next;
+        }
 
-        unless (-e $destination_f) {
-            die;
-        }
-        
-        $query = $dbh->prepare( $sql->update_instance_uri );
-        $query->execute( $local_vol_id, $db_uri, $ins_id );
-        $query->finish;
-#       die;
+        my $validate_ins_id_query = "SELECT * FROM instance WHERE vol_id = ${source_vol_id} AND ins_id = ${ins_id}";
+        my @instances = $dbh->selectall_arrayref( $validate_ins_id_query );
+        if ($#instances != 0) { # We expect one instance on the source
+            print "NO DB ENTRY\n";
+            next;
+        }
+
+
+#       print "PASSED DB CHECK: $#instances\n";
+#       system("stat ${f}");
+        system("mv ${f} ${destination_f}");
+#       system("stat ${destination_f}");
+
+        # Register database change:
+
+        unless (-e $destination_f) {
+            die;
+        }
+
+        $query = $dbh->prepare( $sql->update_instance_uri );
+        $query->execute( $local_vol_id, $db_uri, $ins_id );
+        $query->finish;
+#       die;
     } # END loop over files
     rmdir($subdir);