Changeset 30534 for gs3-extensions/solr/trunk/src

Timestamp:

2016-05-13T18:18:56+12:00 (8 years ago)

Author:

ak19

Message:

1. BUGFIX. When running full-rebuild on a solr collection when the GS3 server is not running, the solrserver.pm needs to start up and stop the tomcat server to get the solr server (off tomcat) to run and ingest the documents. However, once the tomcat is started up solrserver.pm, it does not return (solrserver.pm is stuck in a while loop waiting for further output from ant start). The problem was with JDK version 1.7.0_55, as using the JRE 1.7.0_72 included with the GS307 binary works and so too does JDK 1.8.*. Dr Bainbridge solved the problem more generally by making the while loop exit when the Build Successful message of the ant start command is encountered. Dr Bainbridge also found that the call to fork() (which I'd copied into solrserver from solrjettyserver off which it was based) was no longer applicable and that the child process may similarly have got stuck. The fixes will ensure that the code will work regardless of whether anyone uses it conjunction with the buggy Java 1.7.0_55. 2. With this commit I have tested the recent refactoring of activate.pl into servercontrol.pm (and changes to buildcolutils.pm) by testing full-rebuild and incremental-rebuild.pl against both an already running GS3 server and when the server was not running. Works.

File:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (2 diffs)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -415 +415 @@
     while (defined($line=<STARTIN>)) {     
     
-        #if ($line =~ m/^(BUILD FAILED/) {
+        #if ($line =~ m/^(BUILD FAILED)/) {
         print "Tomcat startup: $line";
         #}
-    }
+        if ($line =~ m/^BUILD SUCCESSFUL/) {
+            last;
+        }
+    }
+
+    close(STARTIN);
+    
     if ($self->server_running()) {
         $server_status = "explicitly-started";
@@ -456 +462 @@
     print " $server_host:$server_port\n";
         
-    # now we know the server is ready to accept connections, fork a
-    # child process that continues to listen to the output and
-    # prints out any lines that are not INFO lines
-
-    if (fork()==0) {
-        # child process
-
-        my $line;
-        while (defined ($line = <STARTIN>)) {
-
-        # if here, then some non-trival message has been logged
-        print "Tomcat/Solr processing: $line";
-        }
-        close(STARTIN);
-        
-        # And now stop nicely
-        exit 0;
-    }
-    # otherwise let the parent continue on
+    # now we know the server is ready to accept connections
     }
     elsif ($server_status eq "already-running") {