You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/06/10 01:43:23 UTC
svn commit: r1491312 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/cloud/
solr/core/src/java/org/apache/solr/core/
solr/core/src/java/org/apache/solr/handler/admin/
solr/core/src/test/org/apache/solr/cloud/...
Author: markrmiller
Date: Sun Jun 9 23:43:23 2013
New Revision: 1491312
URL: http://svn.apache.org/r1491312
Log:
SOLR-4805,SOLR-4843: SolreCore#reload should not call preRegister and publish a DOWN state to ZooKeeper.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sun Jun 9 23:43:23 2013
@@ -98,6 +98,9 @@ Bug Fixes
* SOLR-4891: JsonLoader should preserve field value types from the JSON content stream.
(Steve Rowe)
+
+* SOLR-4805: SolreCore#reload should not call preRegister and publish a DOWN state to
+ ZooKeeper. (Mark Miller, Jared Rodriguez)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sun Jun 9 23:43:23 2013
@@ -1283,11 +1283,7 @@ public final class ZkController {
// before becoming available, make sure we are not live and active
// this also gets us our assigned shard id if it was not specified
publish(cd, ZkStateReader.DOWN, false);
- // shardState and shardRange are for one-time use only, thereafter the actual values in the Slice should be used
- if (Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
- cd.getCloudDescriptor().setShardState(null);
- cd.getCloudDescriptor().setShardRange(null);
- }
+
String coreNodeName = getCoreNodeName(cd);
// make sure the node name is set on the descriptor
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java Sun Jun 9 23:43:23 2013
@@ -423,6 +423,9 @@ public class CoreContainer
public SolrCore call() {
SolrCore c = null;
try {
+ if (zkSys.getZkController() != null) {
+ preRegisterInZk(p);
+ }
c = create(p);
registerCore(p.isTransient(), name, c, false);
} catch (Throwable t) {
@@ -629,22 +632,6 @@ public class CoreContainer
name.indexOf( '\\' ) >= 0 ){
throw new RuntimeException( "Invalid core name: "+name );
}
-
- if (zkSys.getZkController() != null) {
- // this happens before we can receive requests
- try {
- zkSys.getZkController().preRegister(core.getCoreDescriptor());
- } catch (KeeperException e) {
- log.error("", e);
- throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
- "", e);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- log.error("", e);
- throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
- "", e);
- }
- }
SolrCore old = null;
@@ -991,6 +978,9 @@ public class CoreContainer
// the wait as a consequence of shutting down.
try {
if (core == null) {
+ if (zkSys.getZkController() != null) {
+ preRegisterInZk(desc);
+ }
core = create(desc); // This should throw an error if it fails.
core.open();
registerCore(desc.isTransient(), name, core, false);
@@ -1185,6 +1175,21 @@ public class CoreContainer
}
}
}
+
+ public void preRegisterInZk(final CoreDescriptor p) {
+ try {
+ zkSys.getZkController().preRegister(p);
+ } catch (KeeperException e) {
+ log.error("", e);
+ throw new ZooKeeperException(
+ SolrException.ErrorCode.SERVER_ERROR, "", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ log.error("", e);
+ throw new ZooKeeperException(
+ SolrException.ErrorCode.SERVER_ERROR, "", e);
+ }
+ }
public String getSolrHome() {
return solrHome;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java Sun Jun 9 23:43:23 2013
@@ -851,6 +851,10 @@ public final class SolrCore implements S
if (cc != null && cc.isZooKeeperAware() && Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
// set update log to buffer before publishing the core
getUpdateHandler().getUpdateLog().bufferUpdates();
+
+ cd.getCloudDescriptor().setShardState(null);
+ cd.getCloudDescriptor().setShardRange(null);
+
}
// For debugging
// numOpens.incrementAndGet();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sun Jun 9 23:43:23 2013
@@ -505,7 +505,9 @@ public class CoreAdminHandler extends Re
}
}
dcore.setCoreProperties(coreProperties);
-
+ if (coreContainer.getZkController() != null) {
+ coreContainer.preRegisterInZk(dcore);
+ }
SolrCore core = coreContainer.create(dcore);
coreContainer.register(name, core, false);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java Sun Jun 9 23:43:23 2013
@@ -157,6 +157,10 @@ public class ClusterStateUpdateTest exte
dcore.setDataDir(dataDir4.getAbsolutePath());
+ if (container1.getZkController() != null) {
+ container1.preRegisterInZk(dcore);
+ }
+
SolrCore core = container1.create(dcore);
container1.register(core, false);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java Sun Jun 9 23:43:23 2013
@@ -136,12 +136,21 @@ public class SolrIndexSplitterTest exten
CoreDescriptor dcore1 = new CoreDescriptor(h.getCoreContainer(), "split1", h.getCore().getCoreDescriptor().getInstanceDir());
dcore1.setDataDir(indexDir1.getAbsolutePath());
dcore1.setSchemaName("schema12.xml");
+
+ if (h.getCoreContainer().getZkController() != null) {
+ h.getCoreContainer().preRegisterInZk(dcore1);
+ }
+
core1 = h.getCoreContainer().create(dcore1);
h.getCoreContainer().register(core1, false);
CoreDescriptor dcore2 = new CoreDescriptor(h.getCoreContainer(), "split2", h.getCore().getCoreDescriptor().getInstanceDir());
dcore2.setDataDir(indexDir2.getAbsolutePath());
dcore2.setSchemaName("schema12.xml");
+
+ if (h.getCoreContainer().getZkController() != null) {
+ h.getCoreContainer().preRegisterInZk(dcore2);
+ }
core2 = h.getCoreContainer().create(dcore2);
h.getCoreContainer().register(core2, false);
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1491312&r1=1491311&r2=1491312&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Sun Jun 9 23:43:23 2013
@@ -207,6 +207,11 @@ public class TestHarness extends BaseTes
CoreDescriptor dcore = new CoreDescriptor(container, coreName, solrConfig.getResourceLoader().getInstanceDir());
dcore.setConfigName(solrConfig.getResourceName());
dcore.setSchemaName(indexSchema.getResourceName());
+
+ if (container.getZkController() != null) {
+ container.preRegisterInZk(dcore);
+ }
+
SolrCore core = new SolrCore(coreName, dataDirectory, solrConfig, indexSchema, dcore);
container.register(coreName, core, false);