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 2012/01/11 01:16:02 UTC
svn commit: r1229821 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/core/
core/src/test/org/apache/solr/cloud/ example/solr/
solrj/src/java/org/apache/solr/common/cloud/
Author: markrmiller
Date: Wed Jan 11 00:16:02 2012
New Revision: 1229821
URL: http://svn.apache.org/viewvc?rev=1229821&view=rev
Log:
clean up around cloud sys props
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
lucene/dev/branches/solrcloud/solr/example/solr/solr.xml
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Jan 11 00:16:02 2012
@@ -491,7 +491,9 @@ public final class ZkController {
SolrCore core = null;
try {
boolean doRecovery = true;
- if (leaderUrl.equals(ZkCoreNodeProps.getCoreUrl(baseUrl, coreName))) {
+ String ourUrl = ZkCoreNodeProps.getCoreUrl(baseUrl, coreName);
+ log.info("We are " + ourUrl + " and leader is " + leaderUrl);
+ if (leaderUrl.equals(ourUrl)) {
doRecovery = false;
// recover from local transaction log and wait for it to complete before
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/Config.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/Config.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/Config.java Wed Jan 11 00:16:02 2012
@@ -242,7 +242,10 @@ public class Config {
public String get(String path, String def) {
String val = getVal(path, false);
- return val!=null ? val : def;
+ if (val == null || val.length() == 0) {
+ return def;
+ }
+ return val;
}
public int getInt(String path) {
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CoreContainer.java Wed Jan 11 00:16:02 2012
@@ -310,14 +310,7 @@ public class CoreContainer
shareSchema = cfg.getBool("solr/cores/@shareSchema", false);
zkClientTimeout = cfg.getInt("solr/cores/@zkClientTimeout", 10000);
- hostPort = System.getProperty("hostPort");
- if (hostPort == null || hostPort.length() == 0) {
- hostPort = cfg.get("solr/cores/@hostPort", "8983");
- }
- // TODO: should we do this generically in cfg?
- if (hostPort != null && hostPort.length() == 0) {
- hostPort = "8983";
- }
+ hostPort = cfg.get("solr/cores/@hostPort", "8983");
hostContext = cfg.get("solr/cores/@hostContext", "solr");
host = cfg.get("solr/cores/@host", null);
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java Wed Jan 11 00:16:02 2012
@@ -105,6 +105,7 @@ public class CloudStateUpdateTest extend
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
+ System.setProperty("solr.solr.home", TEST_HOME());
System.setProperty("hostPort", "1661");
CoreContainer.Initializer init1 = new CoreContainer.Initializer();
System.setProperty("solr.data.dir", CloudStateUpdateTest.this.dataDir1.getAbsolutePath());
@@ -123,6 +124,7 @@ public class CloudStateUpdateTest extend
System.setProperty("solr.data.dir", CloudStateUpdateTest.this.dataDir3.getAbsolutePath());
container3 = init3.initialize();
System.clearProperty("hostPort");
+ System.clearProperty("solr.solr.home");
log.info("####SETUP_END " + getName());
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Wed Jan 11 00:16:02 2012
@@ -115,6 +115,7 @@ public class LeaderElectionIntegrationTe
System.setProperty("shard", shard);
Initializer init = new CoreContainer.Initializer();
System.setProperty("solr.data.dir", data.getAbsolutePath());
+ System.setProperty("solr.solr.home", TEST_HOME());
Set<Integer> ports = shardPorts.get(shard);
if (ports == null) {
ports = new HashSet<Integer>();
@@ -123,6 +124,7 @@ public class LeaderElectionIntegrationTe
ports.add(port);
CoreContainer container = init.initialize();
containerMap.put(port, container);
+ System.clearProperty("solr.solr.home");
System.clearProperty("hostPort");
}
@@ -244,6 +246,7 @@ public class LeaderElectionIntegrationTe
if (VERBOSE) {
printLayout(zkServer.getZkHost());
}
+
if (zkClient != null) {
zkClient.close();
}
Modified: lucene/dev/branches/solrcloud/solr/example/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/example/solr/solr.xml?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/example/solr/solr.xml (original)
+++ lucene/dev/branches/solrcloud/solr/example/solr/solr.xml Wed Jan 11 00:16:02 2012
@@ -28,7 +28,7 @@
adminPath: RequestHandler path to manage cores.
If 'null' (or absent), cores will not be manageable via request handler
-->
- <cores adminPath="/admin/cores" defaultCoreName="collection1" hostPort="${jetty.port:}">
+ <cores adminPath="/admin/cores" defaultCoreName="collection1" host="${host:}" hostPort="${jetty.port:}">
<core name="collection1" instanceDir="." />
</cores>
</solr>
Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1229821&r1=1229820&r2=1229821&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Wed Jan 11 00:16:02 2012
@@ -141,6 +141,7 @@ public class SolrZkClient {
}
});
connManager.waitForConnected(clientConnectTimeout);
+ // TODO: if we cannot connect initially, stop connect retries from happening...
}
/**