Changeset 29948 for main/trunk

Timestamp:

2015-06-05T21:01:32+12:00 (9 years ago)

Author:

ak19

Message:

Final of two commits to fix rebuilding a collection using the online editor on Windows. Resolves the file lock problem. The changes to the java code from the previous commit work with changes in activate.pl in this commit. activate.pl is passed a flag now so that it no longer de-activates and re-activates the collection itself, but just concerns itself with moving building to index. The GS2Construct java code now de-activates the collection prior to calling activate.pl and then re-activates it afterward. In the way it was done before, activate.pl used to handle de- and re-activating the collection. But when it was launched from the server java code, the java VM would exit having left a copy of the file handles to the perl process when forking the process for activate.pl. The perl code could not move building to index since the file handles had locks (6 of them) on the index/text/collection.gdb. Changes have been made to GS2PerlConstructor too, so that it more cleanly closes all the pipes of a process, that the process itself may thereby exit cleanly. Not yet able to move this properly into its own classes since the StreamGobbler classes in GLI are not quite suited but were customised for FormatConverter. Further changes to activate.pl are for better error reporting.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (9 diffs)

main/trunk/greenstone2/bin/script/activate.pl

@@ -172 +172 @@
             
             # check the page content is as expected
-            my $response_content = $response_obj->content;      
+            my $response_content = $response_obj->content;
+            my $resultstr = $response_content;
+            $resultstr =~ s@.*gs_content\"\>@@s;        
+            $resultstr =~ s@</div>.*@@s;
+            
             if($response_content =~ m/$check_message_against_regex/) {
                 &print_msg(" Response as expected.\n", 3);
+                &print_msg("@@@@@@ Got result:\n$resultstr\n", 4);
                 return 1;
             } else {
@@ -185 +190 @@
                 &print_msg("\n\tBUT: command $library_url$command response UNEXPECTED.\n", 3);
                 &print_msg("*** Got message:\n$response_content.\n", 4);
+                &print_msg("*** Got result:\n$resultstr\n", 3);
                 }
                 return 0; # ping on a collection may "not succeed."
@@ -246 +252 @@
     my $check_responsemsg_against_regex = q/(succeeded)/;
     my $expected_error_code = 500;
+    
+    &print_msg("*** COMMAND WAS: |$command|***\n", 4);
+    
     return config($library_url, $command, $check_responsemsg_against_regex, $site, $expected_error_code, $silent);
 }
@@ -469 +478 @@
 
         print STDERR "\n";
-        print STDERR "Usage: $progname [-collectdir c -builddir b -indexdir i -site s -removeold -keepold -verbosity v\n";
+        print STDERR "Usage: $progname [-collectdir c -builddir b -indexdir i -site s -skipactivation -removeold -keepold -verbosity v\n";
         print STDERR "\t-library_url URL] <[colgroup/]collection>\n";
         print STDERR "\n";
@@ -478 +487 @@
     # get the collection details
     my $qualified_collection = pop @argv; # qualified collection
-        
+    
     my $collect_dir = undef; #"collect"; # can't be "collect" when only -site is provided for GS3
     my $build_dir = undef;
@@ -484 +493 @@
     my $site = undef;
     
+    # if run from server (java code), it will handle deactivation and activation to prevent open file handles when java launches this script and exits:
+    my $skipactivation = 0;
     my $removeold = 0;
     my $keepold = 0;
@@ -503 +514 @@
         elsif ($arg eq "-site") {
             $site = shift @argv;
+        }
+        elsif ($arg eq "-skipactivation") {
+            $skipactivation = 1;
         }
         elsif ($arg eq "-removeold") {
@@ -601 +615 @@
     
     my $is_persistent_server = undef;
-    if($library_url) { # undef if no valid server URL
-   
+    if(!$skipactivation && $library_url) { # undef if no valid server URL
+
         &print_msg("Pinging $library_url\n");       
         if (&ping_library($library_url, $gs_mode, $site)) { # server running
@@ -758 +772 @@
     if(!&FileUtils::directoryExists($build_dir) || &FileUtils::isDirectoryEmpty($build_dir)) {
     
-        if($library_url) { # undef if no valid server URL
+        if(!$skipactivation && $library_url) { # undef if no valid server URL
         
             &print_msg("Pinging $library_url\n");