Changeset 29222

Timestamp:

2014-08-20T22:03:28+12:00 (10 years ago)

Author:

ak19

Message:

SOLR related. TEMPORARY changes for the GS3 workshop. Owing to the change to Solr 4.7.2, solr collections can't re-build despite activate if the GS3 server is running because there is a conflict with the jetty server launched by buildcol and jetty finds a lock on the index. The result is that one can't search the solr index after such a rebuild. Dr Bainbridge suggested a temporary measure: instead of commandline building solr collections, we will now build them in GLI. GLI will build solr collections with activate on but, for solr collections alone, it will stop the GS3 server before a build and start it again upon completion. In future, we will get rid of the solr jetty server and just have solr running over HTTP from tomcat. The Java GS3 runtime code will have to access Solr as a HTTPSolrServer rather than as an EmbeddedSolrServer at that point.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (5 diffs)
• gui/CreatePane.java (modified) (3 diffs)
• util/GS3ServerThread.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1041 +1041 @@
     // used to send reload coll messages to the tomcat server
     static public void configGS3Server(String site, String command) {
+
+        // Do not do configGS3Server for a GS3 solr collection. Not at present at least, when we're stopping
+        // and starting the GS3 server from GLI for solr cols, since this function clears the solr.xml file.
+        if(Gatherer.c_man.isSolrCollection()) {
+        return;
+        }
+
         if (Configuration.library_url == null){
             System.out.println("Error: you have not provided the Greenstone Library address.");  

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -79 +79 @@
 import org.w3c.dom.*;
 
+import org.greenstone.gatherer.util.GS3ServerThread;
+
 /** This class manages many aspects of the collection, from its creation via scripts, data access via methods and its importing and building into the final collection. It is also responsible for firing appropriate event when significant changes have occured within the collection, and for creating a new metadata set manager as necessary.
  * @author John Thompson
@@ -215 +217 @@
     command_parts_list.add("-language");
     command_parts_list.add(Configuration.getLanguage());
+
+    // For now, for solr collections, we pass in -activate
+    // but GLI won't do moving building to index
+    
+    if(CollectionManager.isSolrCollection()) {
+        command_parts_list.add("-activate");
+    }
 
     if(Gatherer.GS3) {
@@ -1734 +1743 @@
             
         if ( CollectionDesignManager.buildcolWasFull() ) {
-            if(installCollection()) {
+
+        // No installCollection() for GS3 solr collection: activate will take care of that
+        // and no call to configGS3Server for solr collection
+        if(CollectionManager.isSolrCollection()) {
+        
+        DebugStream.println("Solr collection build complete: building already moved to index by activate.pl.");
+        
+        // Finished building,
+        // For now, for a GS3 solr collection, we'd have stopped the GS3 server before building
+        // and will now need to restart it.
+        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+        thread.start();
+
+        // sleep before returning and doing the configGS3Server: give the GS3 server time to restart    
+        try {
+            Thread.sleep(5000);
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        }
+        
+        else if(installCollection()) {
             // If we have a local library running then ask it to add our newly create collection
             if (LocalLibraryServer.isRunning() == true) {
@@ -1987 +2018 @@
     }
 
+    public static String getBuildType() {
+    String buildType = (new CollectionMeta( CollectionDesignManager.collect_config.getBuildType() )).getValue(CollectionMeta.TEXT);
+    return buildType;
+    }
+
+    public static boolean isSolrCollection() {
+    return (Gatherer.GS3 && CollectionManager.getBuildType().equals("solr"));
+    }
+
 
     /** Install collection by moving its files from building to index after a successful build.
@@ -1999 +2039 @@
     }
 
-       
+    if(CollectionManager.isSolrCollection()) {
+        // No installCollection() for GS3 solr collection: activate will take care of that
+        DebugStream.println("Solr collection build complete: building already moved to index by activate.pl.");
+
+        // Finished building,
+        // For now, for a GS3 solr collection, we'd have stopped the GS3 server before building
+        // and will now need to restart it.
+        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+        thread.start();
+
+        return true;
+    }
+
+
     DebugStream.println("Build complete. Moving files.");
 

main/trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -63 +63 @@
 
 import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.util.GS3ServerThread;
 
 /** This class provides a GUI view showing some statistics on your current collection, and options for building it. As the collection is built this initial view is replaced with one showing progress bars and a message log of the creation process. This log can be later accessed via the options tree located in the center of the initial pane. This class is also responsible for creating the GShellProgressMonitors that are then attatched to external shell processes, and calling the methods in the CollectionManager for actually importing and building the collection. <br><BR>
@@ -694 +695 @@
             */
                 prepareForBuild();
+
+        // Starting building,
+    // For now, for a GS3 solr collection, we need to stop the GS3 server before building
+    // and restart it after building is complete. Restart is done in CollectionManager.processComplete()
+    if(CollectionManager.isSolrCollection()) {
+        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "stop");
+        thread.start();
+    }
+
                 Gatherer.c_man.importCollection(); //This starts the building process.
             /*
@@ -860 +870 @@
         // Remove the collection lock.
         //Gatherer.g_man.lockCollection(false, false);
+
+        // Cancelling building:
+    // For now, for a GS3 solr collection, we need to stop the GS3 server before building
+    // and restart it after building is complete. If a cancel is pressed during build
+    // then we also restart the GS3 server
+    if(CollectionManager.isSolrCollection()) {
+        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+        thread.start();
+    }
+
+
     }
     }

main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java

@@ -55 +55 @@
     try
         {
+        ///System.err.println("**** GS3 server : " + _ant_command);
+
         String shellCommand = null;
         Process p = null;