Changeset 29355 for gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

Timestamp:

2014-10-08T20:18:48+13:00 (10 years ago)

Author:

ak19

Message:

Overlooked a very important commit, but with corrections: solr cores should not be removed for solr/lucene 4.7.2 as they were for lucene/solr 3.3.0. However, all the solr cores do need to be shutdown on cleanUp() in order to not have the running GS3 server hold a lock on any of the cores, as this will prevent the GS3 tomcat from stopping fully, with part of tomcat still running in the background even if it looks like tomcat has stopped.

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java (modified) (3 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

@@ -79 +79 @@
         solr_server.clear();
 
+        // 2. Need GS3 server (tomcat) to release the cores, else a part of tomcat is still running in the background 
+        // on ant stop, holding a lock on the cores. Doing shutdown() preserves core descriptions in solr.xml
+        solr_cores.shutdown();
+        solr_cores = null;
+
+        // For solr 3.3.0's jetty server, but not for solr 4.7.2's jetty server
+        /*
         // 2. Remove all SolrCores in the CoreContainer (solr_cores) that are specific to this collection
         String collection_core_name_prefix = getCollectionCoreNamePrefix();
@@ -123 +130 @@
             }
         }
-    
+        */
     }
 
@@ -146 +153 @@
             File solr_xml = new File( solr_home,"solr.xml" );
             
-            //solr_cores.load(solr_home_str,solr_xml);          
+            //solr_cores.load(solr_home_str,solr_xml);
             solr_cores.load();
         } catch (Exception e) {