Changeset 27840 for branches/simtest_nebulous_branches/DataStoreServer/scripts/dsreg

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsreg (modified) (6 diffs)

branches/simtest_nebulous_branches/DataStoreServer/scripts/dsreg

@@ -168 +168 @@
 
     if (!$prod_id) {
-        die("product $product not found\n");
+        print STDERR "product '$product' not found\n";
+        if ($force) {
+            exit(0);
+        } else {
+            exit(1);
+        }
     }
     $stmt = $dbh->prepare("SELECT fileset_id,fileset_name FROM dsFileset" .
@@ -188 +193 @@
     my $fileset_id = $fs_row->{fileset_id};
 
+    my $rows_affected;
     eval {
         $dbh->do("DELETE from dsFile where fileset_id = $fileset_id");
-        $dbh->do("DELETE from dsFileset where fileset_id = $fileset_id");
+        $rows_affected = $dbh->do("DELETE from dsFileset where fileset_id = $fileset_id");
 
         if ($old_last_fs eq $fs_row->{fileset_name}) {
@@ -203 +209 @@
                 $new_last_fs = $new_newest->{fileset_name};
             } else {
-                $new_last_fs = "none";
+                $new_last_fs = undef;
             }
             $stmt->finish();
-            $dbh->do("UPDATE dsProduct SET last_fs = \'$new_last_fs\' WHERE prod_id = $prod_id");
+            $dbh->do("UPDATE dsProduct SET last_fs = ? WHERE prod_id = $prod_id", undef, ($new_last_fs));
         }
         $dbh->commit();
     };
-    if ($@) { # an error occured
+    if (!$rows_affected or $@) { # an error occured
         print STDERR "transaction failed, rolling back error was:\n$@\n";
         # roll back within eval to prevent rollback failure from terminating the script
         eval {$dbh->rollback();};
-        cleanup();
         exit 1;
     }
@@ -221 +226 @@
 
     if ($remove) {
-        if (system "rm -r $fileset_dir") {
-            die("failed to remove $fileset_dir");
+        my $rc;
+        if (($rc = system "rm -r $fileset_dir")) {
+            die("failed to remove $fileset_dir error code: $rc");
         }
     } else  {
-        # zap the index script
+        # just zap the index script
         unlink("$index_script_name");
     }
@@ -350 +356 @@
                 die "file $path not found";
             }
-            if (!$file->{bytes}) {
-                my @finfo = stat($path);
-                unless (@finfo) {
-                    die ("can't stat $path");
+            # get the size of the file
+            my @finfo = stat($path);
+            unless (@finfo) {
+                die ("can't stat $path");
+            }
+            # if size was supplied make sure that it matches the actual
+            # size
+            if ($file->{bytes}) {
+                my $current_size = $finfo[7];
+                if ($file->{bytes} != $current_size) {
+                    die "size on disk: $current_size does not match supplied"
+                    . " size: $file->{bytes} for $path";
                 }
+            } else {
                 $file->{bytes}  = $finfo[7];
             }
@@ -360 +375 @@
                 # Get MD5 sum
                 $file->{md5sum} = file_md5_hex($path);
+                die("failed to compute valid md5sum for $path") if !$file->{md5sum};
             }
         }