Changeset 25401 for gs2-extensions/parallel-building/trunk/src/perllib/inexport.pm

Timestamp:

2012-04-18T10:21:00+12:00 (12 years ago)

Author:

jmt12

Message:

Extend the code that 'pre-started' the GDBMServer to pre-start any infodbtype ending with *server (to support the new TDBServer)

File:

• gs2-extensions/parallel-building/trunk/src/perllib/inexport.pm (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/inexport.pm

@@ -482 +482 @@
     # This is done so that, in parallel importing, the server will persist
     # until the top level import.pl (which will be the first this that calls
-    # this function) completes.
-    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $archivedir, 1);
-    my $arcinfo_src_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-src", $archivedir, 1);
+    # this function) completes. [jmt12]
+    my $create_server = 0;
+    # - infodb's of type *server need to be started on the same machine that
+    #   runs parallel-import.sh, especially when distributed processing
+    #   gets involved.
+    if ($collectcfg->{'infodbtype'} =~ /server$/)
+    {
+      $create_server = 1;
+    }
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-doc", $archivedir, $create_server);
+    my $arcinfo_src_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-src", $archivedir, $create_server);
 
     my $archive_info = new arcinfo ($collectcfg->{'infodbtype'});
@@ -589 +597 @@
     if ($manifest eq '' || (defined $collectcfg->{'complexmeta'} && $collectcfg->{'complexmeta'} eq 'true'))
     {
-      print "Temporarily skipping global file scan as it is slow as molasses\n";
-      #&plugin::file_block_read($pluginfo, $importdir, "", $block_hash, $metadata, $gli);
+      #print "Temporarily skipping global file scan as it is slow as molasses\n";
+      &plugin::file_block_read($pluginfo, $importdir, "", $block_hash, $metadata, $gli);
     }
     else