You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/05/01 14:28:00 UTC
[1/2] lucene-solr:master: SOLR-9386: Move default clientPort
specification to before calling QuorumPeerConfig.parseProperties(),
which requires that clientPort be specified.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 66bf7a8e3 -> c44d0bc89
refs/heads/master b705217be -> 8c11f81a9
SOLR-9386: Move default clientPort specification to before calling QuorumPeerConfig.parseProperties(), which requires that clientPort be specified.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8c11f81a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8c11f81a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8c11f81a
Branch: refs/heads/master
Commit: 8c11f81a9505a0719e971ed6c54c9b6fc10bfa13
Parents: b705217
Author: Steve Rowe <sa...@apache.org>
Authored: Mon May 1 10:26:41 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon May 1 10:26:41 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c11f81a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
index 9c2016f..418a5f0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -85,10 +85,10 @@ public class SolrZkServer {
try {
props = SolrZkServerProps.getProperties(confHome + '/' + "zoo.cfg");
SolrZkServerProps.injectServers(props, zkRun, zkHost);
- zkProps.parseProperties(props);
- if (zkProps.getClientPortAddress() == null) {
- zkProps.setClientPort(solrPort + 1000);
+ if (props.getProperty("clientPort") == null) {
+ props.setProperty("clientPort", Integer.toString(solrPort + 1000));
}
+ zkProps.parseProperties(props);
} catch (QuorumPeerConfig.ConfigException | IOException e) {
if (zkRun != null)
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
[2/2] lucene-solr:branch_6x: SOLR-9386: Move default clientPort
specification to before calling QuorumPeerConfig.parseProperties(),
which requires that clientPort be specified.
Posted by sa...@apache.org.
SOLR-9386: Move default clientPort specification to before calling QuorumPeerConfig.parseProperties(), which requires that clientPort be specified.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c44d0bc8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c44d0bc8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c44d0bc8
Branch: refs/heads/branch_6x
Commit: c44d0bc89c03de2a3a69a1765d70b8aa0d81b475
Parents: 66bf7a8
Author: Steve Rowe <sa...@apache.org>
Authored: Mon May 1 10:26:41 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon May 1 10:27:08 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c44d0bc8/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
index 9c2016f..418a5f0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -85,10 +85,10 @@ public class SolrZkServer {
try {
props = SolrZkServerProps.getProperties(confHome + '/' + "zoo.cfg");
SolrZkServerProps.injectServers(props, zkRun, zkHost);
- zkProps.parseProperties(props);
- if (zkProps.getClientPortAddress() == null) {
- zkProps.setClientPort(solrPort + 1000);
+ if (props.getProperty("clientPort") == null) {
+ props.setProperty("clientPort", Integer.toString(solrPort + 1000));
}
+ zkProps.parseProperties(props);
} catch (QuorumPeerConfig.ConfigException | IOException e) {
if (zkRun != null)
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);