Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/DataStoreServer/scripts/dsreg

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/DataStoreServer/scripts/dsreg

@@ -31 +31 @@
 my $fileset;
 my $filelist;
+my $empty;
 
 my $fstype;
@@ -64 +65 @@
         'product=s'     =>      \$product,
         'list=s'        =>      \$filelist,
+        'empty'         =>      \$empty,
         'type=s'        =>      \$fstype,
         'datapath=s'    =>      \$datapath,
@@ -95 +97 @@
     $fileset = $add;
     $err .= "--type is required\n" unless defined $fstype;
-    $err .= "--list is required\n" unless defined $filelist;
+    $err .= "--list is required\n" unless defined $filelist or $empty;
     if ($linkfiles and $copyfiles) {
         $err .= "only one of --link and --copy is allowed\n";
     }
     if (($linkfiles or $copyfiles) and !$datapath and !$abspath) {
-        $err .= "need to specify datapath with --link or --copy\n";
-    }
-    if ($linkfiles && (substr($datapath, 0, 1) ne "/")) {
+        $err .= "need to specify datapath or abspath with --link and --copy\n";
+    }
+    if (!$abspath && $linkfiles && (substr($datapath, 0, 1) ne "/")) {
         $err .= "datapath must begin with / when using --link\n";
     }
@@ -135 +137 @@
     unless defined stat("$dsroot/$product/index.txt");
 
-$dbname      = metadataLookupStr($siteConfig, 'DBNAME') unless defined $dbname;
-my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
-my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
-my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
+$dbname      = metadataLookupStr($siteConfig, 'DS_DBNAME') unless defined $dbname;
+my $dbserver = metadataLookupStr($siteConfig, 'DS_DBSERVER');
+my $dbuser   = metadataLookupStr($siteConfig, 'DS_DBUSER');
+my $dbpass   = metadataLookupStr($siteConfig, 'DS_DBPASSWORD');
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
 
 my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
-my %conn_attrs = (PrintError => 1, RaiseError => 1, AutoCommit => 0);
+# mysql cookbook says 'PrintError can interfere with failure detection in some cases'
+my %conn_attrs = (PrintError => 0, RaiseError => 1, AutoCommit => 0);
 
 my $dbh = DBI->connect_cached($dsn, $dbuser, $dbpass, \%conn_attrs)
@@ -209 +212 @@
     if ($@) { # 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();
@@ -251 +255 @@
     }
 
+
     # Note: There is a race condition here. Somebody could sneak in now and add a fileset with
     # fileset_name = $fileset. So later we'll check again that only one fileset with the name exists
 
-
-    my $in;
-    if ($filelist eq "-") {
-        $in = *STDIN;
-    } else {
-        open $in, "<$filelist" or die  "cannot open filelist file $filelist\n";
-    }
-
-    my $lineno = 0;
+    ## create the fileset directory
+    if (! -e $fileset_dir) {
+        if (!mkdir $fileset_dir) {
+            die("failed trying to create fileset directory $fileset_dir");
+        }
+    }
+
     my @files;
-    while (<$in>) {
-        chomp;
-        $lineno++;
-
-        my $filename;
-        my $bytes;
-        my $md5sum;
-        my $filetype;
-
-        my @fields = split /\|/;
-        if (@fields < 4) {
-            die "malformed input line at $filelist line $lineno: $_\n";
-        }
-        $filename = shift @fields;
-        $bytes    = shift @fields;  # if this is null it will be calculated below
-        $md5sum   = shift @fields;  # if this is null it will be calculated below
-        $filetype = shift @fields;
-
-        # make sure the length of the type specific columns is 8
-        while (@fields < 8) {
-            push @fields, undef;
-        }
-        my $ts_cols = [@fields];
-
-        my $hashref = {
-            'file'      => $filename,
-            'bytes'     => $bytes,
-            'md5sum'    => $md5sum,
-            'type'      => $filetype,
-            'ts_cols'   => $ts_cols,
-        };
-
-        push @files, $hashref;
-    }
-
-    die("empty filelist\n") if (@files == 0);
-
-    # Prepare the fileset directory
-    if ($linkfiles or $copyfiles) {
-        ## create the fileset directory
-        if (! -e $fileset_dir) {
-            if (!mkdir $fileset_dir) {
-                die("failed trying to create fileset directory $fileset_dir");
-            }
-        }
-        eval {
-            ## then copy or symlink the files into place
-            foreach my $ref (@files) {
-                my $src = (defined $abspath ? '' : "$datapath/") . "$ref->{file}";
-                my $filename = fileparse($ref->{file}, ());
-                my $dest = "$fileset_dir/$filename";
-
-                if ($linkfiles) {
-                    if (! symlink $src, $dest) {
-                        die("failed trying to link $src to $dest");
-                    }
-                } else {
-                    if (!copy($src, $dest)) {
-                        die("copy($src, $dest) failed");
+    if (!$empty) {
+        my $in;
+        if ($filelist eq "-") {
+            $in = *STDIN;
+        } else {
+            open $in, "<$filelist" or die  "cannot open filelist file $filelist\n";
+        }
+
+        my $lineno = 0;
+        while (<$in>) {
+            chomp;
+            $lineno++;
+
+            my $filename;
+            my $bytes;
+            my $md5sum;
+            my $filetype;
+
+            my @fields = split /\|/;
+            if (@fields < 4) {
+                die "malformed input line at $filelist line $lineno: $_\n";
+            }
+            $filename = shift @fields;
+            $bytes    = shift @fields;  # if this is null it will be calculated below
+            $md5sum   = shift @fields;  # if this is null it will be calculated below
+            $filetype = shift @fields;
+
+            # make sure the length of the type specific columns is 8
+            while (@fields < 8) {
+                push @fields, undef;
+            }
+            my $ts_cols = [@fields];
+
+            my $hashref = {
+                'file'      => $filename,
+                'bytes'     => $bytes,
+                'md5sum'    => $md5sum,
+                'type'      => $filetype,
+                'ts_cols'   => $ts_cols,
+            };
+
+            push @files, $hashref;
+        }
+
+        die("empty filelist\n") if (@files == 0);
+
+        # Prepare the fileset directory
+        if ($linkfiles or $copyfiles) {
+            eval {
+                ## then copy or symlink the files into place
+                foreach my $ref (@files) {
+                    my $src = (defined $abspath ? '' : "$datapath/") . "$ref->{file}";
+                    my $filename = fileparse($ref->{file}, ());
+                    my $dest = "$fileset_dir/$filename";
+
+                    if ($linkfiles) {
+                        if (! symlink $src, $dest) {
+                            die("failed trying to link $src to $dest");
+                        }
+                    } else {
+                        if (!copy($src, $dest)) {
+                            die("copy($src, $dest) failed");
+                        }
                     }
                 }
-            }
-        };
-        if ($@) { # an error occured
-            print STDERR "error preparing the fileset directory: $@\n";
-
-            if (!$no_cleanup && system "rm -r $fileset_dir") {
-                die("failed to remove $fileset_dir");
-            }
-            exit $PS_EXIT_UNKNOWN_ERROR;
-        }
-    }
-
-    # now calculate the md5sum and file size if they weren't provided
-    foreach my $file (@files) {
-        my $filename = fileparse($file->{file}, ());
-        my $path = "$fileset_dir/$filename";
-        if (! -e $path ) {
-            die "file $path not found";
-        }
-        if (!$file->{bytes}) {
-            my @finfo = stat($path);
-            unless (@finfo) {
-                die ("can't stat $path");
-            }
-            $file->{bytes}  = $finfo[7];
-        }
-        if (!$file->{md5sum}) {
-            # Get MD5 sum
-            $file->{md5sum} = file_md5_hex($path);
+            };
+            if ($@) { # an error occured
+                print STDERR "error preparing the fileset directory: $@\n";
+
+                if (!$no_cleanup && system "rm -r $fileset_dir") {
+                    die("failed to remove $fileset_dir");
+                }
+                exit $PS_EXIT_UNKNOWN_ERROR;
+            }
+        }
+
+        # now calculate the md5sum and file size if they weren't provided
+        foreach my $file (@files) {
+            my $filename = fileparse($file->{file}, ());
+            my $path = "$fileset_dir/$filename";
+            if (! -e $path ) {
+                die "file $path not found";
+            }
+            if (!$file->{bytes}) {
+                my @finfo = stat($path);
+                unless (@finfo) {
+                    die ("can't stat $path");
+                }
+                $file->{bytes}  = $finfo[7];
+            }
+            if (!$file->{md5sum}) {
+                # Get MD5 sum
+                $file->{md5sum} = file_md5_hex($path);
+            }
         }
     }
@@ -471 +478 @@
     --copy      Copy files from datapath to Data Store
     --datapath  path to source files for --copy or --link
+    --abspath   path to source files is absoloute (--datapath not needed)
     --ps0 - ps7 Optional product specific data
     --rm        with --del remove the fileset directory from the Data Store