Changeset 26872 for branches/eam_branches/20091201/DataStoreServer/scripts/dsreg

Timestamp:

Feb 10, 2010, 4:14:16 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20091201/DataStoreServer/scripts/dsreg (modified) (4 diffs)

branches/eam_branches/20091201/DataStoreServer/scripts/dsreg

@@ -193 +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}) {
@@ -215 +216 @@
         $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;
     }
@@ -226 +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");
     }
@@ -365 +366 @@
                 # Get MD5 sum
                 $file->{md5sum} = file_md5_hex($path);
+                die("failed to compute valid md5sum for $path") if !$file->{md5sum};
             }
         }