Changeset 29355

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.

Location:

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

Files:

• GS2SolrSearch.java (modified) (2 diffs)
• SolrSearch.java (modified) (3 diffs)

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

@@ -163 +163 @@
         super.cleanUp();
         this.solr_src.cleanUp();
+
+
+        // 1. clear the map keeping track of the solrcores' EmbeddedSolrServers in this collection
+        solr_core_cache.clear();
+
+        // 2. For solr 4.7.2., GLI (and ant stop from cmd) is unable to shutdown the tomcat server fully, 
+        // IF any collection has been previewed AND if there are any solr collections in the collect folder.
+        // This is because although the GS3 server seems to have stopped running at this stage, running a
+        // `ps aux | grep tomcat` reveals that some part of tomcat is still running. It seems to be still 
+        // holding on to the cores. Doing an all_cores.shutdown() here, stops GS3 from hanging on to the cores
+        // while still preserving the core desciptions in web/ext/solr.xml as needed when restarting the GS3 server.
+
+        // 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
+        all_solr_cores.shutdown();
+        all_solr_cores = null;
+        
+        // For solr 3.3.0's jetty server, but not for solr 4.7.2's jetty server:
+        /*
 
         // When cleaning up, not only do we need to empty the solr_core_cache map, but we also need to remove all
@@ -221 +240 @@
             }
         }
+        */
     }
 

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) {