Changeset 33392 for gs3-extensions/solr/trunk/src/perllib/solrserver.pm

Timestamp:

2019-08-08T15:15:11+12:00 (4 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:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (1 diff)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -407 +407 @@
 }
 
+sub admin_unload_core_explicitly_retaining_index
+{
+    # For UNLOAD core params, see page 315 of
+    #    https://archive.apache.org/dist/lucene/solr/ref-guide/apache-solr-ref-guide-4.7.pdf
+    
+    my $self = shift @_;
+    my ($core) = @_;
+    
+    # Don't delete index (sidx/didx folder) along with unloading core, so force 0 as parameter
+    # (though not deleting the index is the default behaviour of admin_unload_core() anyway,
+    # since activate is meant to manually take care of deleting the index folder and moving the
+    # building folder to replace index, instead of activate asking unload_core to delete the
+    # index folder).
+    # But this function's very particular behaviour may be crucial for other instances such as
+    # its use in solrbuilder::post_build_indexes(), so even if admin_unload_core() could
+    # conceivably be changed to delete the index by default, this method would still do the
+    # right thing when called by solrbuilder::post_build_indexes().
+    $self->admin_unload_core($core, 0);
+}
+
+
 sub start
 {