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

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.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (3 diffs)

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();
+    }
+
+
     }
     }