Changeset 26015 for trunk/ippScripts/scripts/dist_make_fileset.pl

Timestamp:

Nov 3, 2009, 1:02:08 PM (17 years ago)

Author:

bills

Message:

Spread building of distribution bundles over a number of hosts (currently 5)

File:

• trunk/ippScripts/scripts/dist_make_fileset.pl (modified) (5 diffs)

trunk/ippScripts/scripts/dist_make_fileset.pl

@@ -53 +53 @@
            'label=s'        => \$label,
            'dist_group=s'   => \$dist_group,
-           'filter=s'      => \$filter,
+           'filter=s'       => \$filter,
            'ds_dbhost=s'    => \$ds_dbhost,  # database host for the datastore database
            'ds_dbname=s'    => \$ds_dbname,  # database name for the datastore database
@@ -94 +94 @@
 
 # make sure that the database info file for this run exists
-my $dbinfo_file = "dbinfo.$stage.$stage_id.mdc";
-if (! -e "$dist_dir/$dbinfo_file" ) {
+my $dbinfo_file = "$dist_dir/dbinfo.$stage.$stage_id.mdc";
+if (! -e "$dbinfo_file" ) {
     &my_die("dbinfo file for dist run $dbinfo_file not found", $dist_id, $dest_id, $PS_EXIT_UNKNOWN_ERROR);
 }
@@ -101 +101 @@
 
 # make sure that the dirinfo file for this run exists
-my $dirinfo_file = "dirinfo.$stage.$stage_id.mdc";
-if (! -e "$dist_dir/$dirinfo_file" ) {
+my $dirinfo_file = "$dist_dir/dirinfo.$stage.$stage_id.mdc";
+if (! -e "$dirinfo_file" ) {
     &my_die("dirinfo file for dist run $dirinfo_file not found", $dist_id, $dest_id, $PS_EXIT_UNKNOWN_ERROR);
 }
@@ -142 +142 @@
     my $md5sum = $component->{md5sum};
     # name of the file
-    my $name = $component->{name};
+    my $file_name = $component->{name};
     # component id (class_is or skycell_id)
+    my $comp_dir = $component->{outdir};
     my $comp_name = $component->{component};
 
     # XXX: if tarfile is not always the right type we need to add a type to distComponent
-    print $listFile "$name|$size|$md5sum|tgz|$comp_name|\n";
+    print $listFile "$comp_dir/$file_name|$size|$md5sum|tgz|$comp_name|\n";
 }
 
@@ -156 +157 @@
 
     # the data store will refer to the distribution bundle via symlinks back to distRun.outdir
-    $command .= " --datapath $dist_dir --link";
+#    $command .= " --datapath $dist_dir --link";
+    $command .= " --abspath --link";
 
     # set the product specific columns in product list