Changeset 33392 for main

Timestamp:

2019-08-08T15:15:11+12:00 (5 years ago)

Author:

ak19

Message:

Kathy found a problem whereby she wanted to run consecutive buildcols without activate on a solr collection. She experienced file locking issues on Windows, which the original solr related building code would inevitably cause without activate. Dr Bainbridge's solution was to change our way of thinking about what activate and buildcol should now be doing as regards solr collections. The solution was to unload building-cores for indexes at the end of buildcol, instead of only doing this during activate.pl. I've tried to be conservative with the changes made to the existing code, so that activate still attempts to also unload building-cores, but first pings them (and any other cores it attempts to unload) to ensure the cores exist. During buildcol too, the building-cores are pinged to check they exist before we attempt to unload them.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (4 diffs)

main/trunk/greenstone2/bin/script/activate.pl

@@ -277 +277 @@
     
     # If the Solr/Jetty server is not already running, the following starts
-    # it up, and only returns when the server is "reading and listening"    
+    # it up, and only returns when the server is "ready and listening"  
     $solr_server = new solrserver($build_dir);
     $solr_server->start();
     
-    # We'll be moving building to index. For solr collection, there's further 
+    # We'll be moving building to index. For a solr collection, there's further 
     # special processing to make a corresponding change to the solr.xml
     # by removing the temporary building cores and (re)creating the index cores
@@ -307 +307 @@
         # if solr, remove any cores that are using the index_dir before deleting this dir
         foreach my $corename (@corenames) {
-            $solr_server->admin_unload_core($corename);
+            $solr_server->admin_unload_core($corename) if ($solr_server->admin_ping_core($corename));
         }
         }   
@@ -327 +327 @@
         # if solr, remove any cores that are using the building_dir before moving this dir onto index
         foreach my $corename (@corenames) {
-        $solr_server->admin_unload_core("building-$corename");
+        $solr_server->admin_unload_core("building-$corename") if ($solr_server->admin_ping_core("building-$corename"));
         }
     }
@@ -376 +376 @@
             $solr_server->admin_unload_core($corename); 
         } 
-            $solr_server->admin_create_core($corename, $index_dir);
+        $solr_server->admin_create_core($corename, $index_dir);
         
         }