You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/12/30 05:01:34 UTC
lucene-solr:jira/solr-11702: SOLR-11702: Fix precommit
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 538e269a4 -> 3cd749855
SOLR-11702: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3cd74985
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3cd74985
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3cd74985
Branch: refs/heads/jira/solr-11702
Commit: 3cd749855dc74bb1f5407c998115528c1f5c36f8
Parents: 538e269
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Dec 30 12:01:22 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Dec 30 12:01:22 2017 +0700
----------------------------------------------------------------------
.../org/apache/solr/cloud/RecoveryStrategy.java | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3cd74985/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index f57b06a..6904794 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -741,26 +741,6 @@ public class RecoveryStrategy implements Runnable, Closeable {
LOG.info("Finished recovery process, successful=[{}]", Boolean.toString(successfulRecovery));
}
- private Replica checkConnectionToLeader(String ourUrl, CloudDescriptor cloudDesc) throws InterruptedException {
- while (true) {
- final Replica leaderReplica = zkStateReader.getLeaderRetry(
- cloudDesc.getCollectionName(), cloudDesc.getShardId());
- if (isClosed()) {
- return leaderReplica;
- }
- if (leaderReplica.getCoreUrl().equals(ourUrl)) {
- return leaderReplica;
- }
- try (Socket socket = new Socket()) {
- URL url = new URL(leaderReplica.getBaseUrl());
- socket.connect(new InetSocketAddress(url.getHost(), url.getPort()), 2000);
- return leaderReplica;
- } catch (IOException e) {
- LOG.info("Failed to connect leader {}, try again", leaderReplica.getBaseUrl());
- }
- }
- }
-
public static Runnable testing_beforeReplayBufferingUpdates;
final private Future<RecoveryInfo> replay(SolrCore core)