You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/05/08 06:52:38 UTC
svn commit: r1480160 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/CoreContainer.java
core/src/java/org/apache/solr/core/ZkContainer.java
test-framework/src/java/org/apache/solr/util/TestHarness.java
Author: hossman
Date: Wed May 8 04:52:38 2013
New Revision: 1480160
URL: http://svn.apache.org/r1480160
Log:
SOLR-4622: Hardcoded SolrCloud defaults for hostContext and hostPort that were deprecated in 4.3 have been removed completely.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1480160&r1=1480159&r2=1480160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed May 8 04:52:38 2013
@@ -38,6 +38,12 @@ TBD...
Detailed Change List
----------------------
+Other Changes
+----------------------
+
+* SOLR-4622: Hardcoded SolrCloud defaults for hostContext and hostPort that
+ were deprecated in 4.3 have been removed completely. (hossman)
+
================== 4.4.0 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1480160&r1=1480159&r2=1480160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Wed May 8 04:52:38 2013
@@ -1113,12 +1113,12 @@ public class CoreContainer
coresAttribs.put("defaultCoreName", defaultCoreName);
}
- addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_HOSTPORT, "hostPort",zkSys.getHostPort(), ZkContainer.DEFAULT_HOST_PORT);
+ addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_HOSTPORT, "hostPort",zkSys.getHostPort(), null);
addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_ZKCLIENTTIMEOUT, "zkClientTimeout",
intToString(this.zkClientTimeout),
Integer.toString(DEFAULT_ZK_CLIENT_TIMEOUT));
addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_HOSTCONTEXT, "hostContext",
- zkSys.getHostContext(), ZkContainer.DEFAULT_HOST_CONTEXT);
+ zkSys.getHostContext(), null);
addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_LEADERVOTEWAIT, "leaderVoteWait",
zkSys.getLeaderVoteWait(), LEADER_VOTE_WAIT);
addCoresAttrib(coresAttribs, ConfigSolr.CfgProp.SOLR_CORELOADTHREADS, "coreLoadThreads",
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java?rev=1480160&r1=1480159&r2=1480160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java Wed May 8 04:52:38 2013
@@ -43,11 +43,6 @@ import org.xml.sax.InputSource;
public class ZkContainer {
protected static Logger log = LoggerFactory.getLogger(ZkContainer.class);
- /** @deprecated will be remove in Solr 5.0 (SOLR-4622) */
- public static final String DEFAULT_HOST_CONTEXT = "solr";
- /** @deprecated will be remove in Solr 5.0 (SOLR-4622) */
- public static final String DEFAULT_HOST_PORT = "8983";
-
protected ZkController zkController;
private SolrZkServer zkServer;
private int zkClientTimeout;
@@ -119,21 +114,14 @@ public class ZkContainer {
if (zkRun == null && zookeeperHost == null)
return; // not in zk mode
-
- // BEGIN: SOLR-4622: deprecated hardcoded defaults for hostPort & hostContext
if (null == hostPort) {
- // throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
- // "'hostPort' must be configured to run SolrCloud");
- log.warn("Solr 'hostPort' has not be explicitly configured, using hardcoded default of " + DEFAULT_HOST_PORT + ". This default has been deprecated and will be removed in future versions of Solr, please configure this value explicitly");
- hostPort = DEFAULT_HOST_PORT;
+ throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
+ "'hostPort' must be configured to run SolrCloud");
}
if (null == hostContext) {
- // throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
- // "'hostContext' must be configured to run SolrCloud");
- log.warn("Solr 'hostContext' has not be explicitly configured, using hardcoded default of " + DEFAULT_HOST_CONTEXT + ". This default has been deprecated and will be removed in future versions of Solr, please configure this value explicitly");
- hostContext = DEFAULT_HOST_CONTEXT;
+ throw new ZooKeeperException(SolrException.ErrorCode.SERVER_ERROR,
+ "'hostContext' must be configured to run SolrCloud");
}
- // END: SOLR-4622
// zookeeper in quorum mode currently causes a failure when trying to
// register log4j mbeans. See SOLR-2369
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1480160&r1=1480159&r2=1480160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Wed May 8 04:52:38 2013
@@ -183,8 +183,8 @@ public class TestHarness extends BaseTes
String solrHome = SolrResourceLoader.locateSolrHome();
container = new CoreContainer(new SolrResourceLoader(solrHome)) {
{
- String hostPort = System.getProperty("hostPort");
- String hostContext = "solr";
+ String hostPort = System.getProperty("hostPort", "8983");
+ String hostContext = System.getProperty("hostContext", "solr");
defaultCoreName = CoreContainer.DEFAULT_DEFAULT_CORE_NAME;
initShardHandler();
zkSys.initZooKeeper(this, solrHome, System.getProperty("zkHost"), 30000, hostPort, hostContext, null, "30000", 30000, 30000);