Changeset 25889 for gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

Timestamp:

2012-06-28T21:25:18+12:00 (12 years ago)

Author:

ak19

Message:

Second set of commits for getting activate.pl to deal with solr cores when moving building to index. This time it uses the building- prefix and things still work. However, if the GS3 server is already running, an ant restart is required before searches return results and not sure about whether the incremental case is covered properly. The index reason is still being created for some reason when building.

File:

• gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm (modified) (3 diffs)

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

@@ -116 +116 @@
     my $core_prefix = (defined $site) ? "$site-$collect" : $collect;
     my $core        = $core_prefix; # unused in this call to solr_passes
+
+    $core = "building-".$core unless $self->{'incremental'}; # core points to building only for force_removeold
 
         print STDERR "Executable:    $solr_passes_exe\n";
@@ -397 +399 @@
     if ($force_removeold) {
         print $outhandle "\n-removeold set (new index will be created)\n";
+
+        # create cores under temporary core names, corresponding to building directory
+        $core = "building-".$core; 
 
         my $full_index_dir = &util::filename_cat($build_dir,$index_dir);
@@ -516 +521 @@
     my $core        = "$core_prefix-$ds_idx";
 
+    $core = "building-".$core unless $self->{'incremental'}; # core points to building only for force_removeold
+
     print STDERR "Cmd: $solr_passes_exe $core index \"$build_dir\" \"$indexdir\"   $osextra\n";
     if (!open($handle, "| $solr_passes_exe $core index \"$build_dir\" \"$indexdir\"   $osextra")) {