From 43a5cbe9bee92898056db7ba0db2d548514a16bd Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Fri, 11 Jul 2014 11:38:25 +0200
Subject: [PATCH] Only use IndexShard instance to lookup recovery status make
 sure we use the instance itself to look it up, and not the shard id, as we
 might get another instance leftover from #6825

---
 .../recovery/TransportRecoveryAction.java     |  2 +-
 .../cluster/IndicesClusterStateService.java   |  2 +-
 .../indices/recovery/RecoveryTarget.java      | 25 ++++++-------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
index 7a79b5ebfc3..8be0ee8d1cd 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
@@ -157,7 +157,7 @@ public class TransportRecoveryAction extends
         RecoveryStatus recoveryStatus = indexShard.recoveryStatus();
 
         if (recoveryStatus == null) {
-            recoveryStatus = recoveryTarget.recoveryStatus(indexShard.shardId());
+            recoveryStatus = recoveryTarget.recoveryStatus(indexShard);
         }
 
         if (recoveryStatus != null) {
diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
index f7f4816ad42..59739fb9dee 100644
--- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -544,7 +544,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
                     indexService.removeShard(shardRouting.id(), "removing shard (different instance of it allocated on this node)");
                 } else if (isPeerRecovery(shardRouting)) {
                     // check if there is an existing recovery going, and if so, and the source node is not the same, cancel the recovery to restart it
-                    RecoveryStatus recoveryStatus = recoveryTarget.recoveryStatus(indexShard.shardId());
+                    RecoveryStatus recoveryStatus = recoveryTarget.recoveryStatus(indexShard);
                     if (recoveryStatus != null && recoveryStatus.stage() != RecoveryState.Stage.DONE) {
                         // we have an ongoing recovery, find the source based on current routing and compare them
                         DiscoveryNode sourceNode = findSourceNodeForPeerRecovery(routingTable, nodes, shardRouting);
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
index eaecbd9e159..9c995028db1 100644
--- a/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
+++ b/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
@@ -109,16 +109,15 @@ public class RecoveryTarget extends AbstractComponent {
         });
     }
 
-    public RecoveryStatus recoveryStatus(ShardId shardId) {
-        RecoveryStatus peerRecoveryStatus = findRecoveryByShardId(shardId);
-        if (peerRecoveryStatus == null) {
+    public RecoveryStatus recoveryStatus(IndexShard indexShard) {
+        RecoveryStatus recoveryStatus = findRecoveryByShard(indexShard);
+        if (recoveryStatus == null) {
             return null;
         }
-        // update how long it takes if we are still recovering...
-        if (peerRecoveryStatus.recoveryState().getTimer().startTime() > 0 && peerRecoveryStatus.stage() != RecoveryState.Stage.DONE) {
-            peerRecoveryStatus.recoveryState().getTimer().time(System.currentTimeMillis() - peerRecoveryStatus.recoveryState().getTimer().startTime());
+        if (recoveryStatus.recoveryState().getTimer().startTime() > 0 && recoveryStatus.stage() != RecoveryState.Stage.DONE) {
+            recoveryStatus.recoveryState().getTimer().time(System.currentTimeMillis() - recoveryStatus.recoveryState().getTimer().startTime());
         }
-        return peerRecoveryStatus;
+        return recoveryStatus;
     }
 
     public void cancelRecovery(IndexShard indexShard) {
@@ -179,7 +178,7 @@ public class RecoveryTarget extends AbstractComponent {
     }
 
     public void retryRecovery(final StartRecoveryRequest request, TimeValue retryAfter, final RecoveryStatus status, final RecoveryListener listener) {
-        threadPool.schedule(retryAfter, ThreadPool.Names.GENERIC ,new Runnable() {
+        threadPool.schedule(retryAfter, ThreadPool.Names.GENERIC, new Runnable() {
             @Override
             public void run() {
                 doRecovery(request, status, listener);
@@ -319,16 +318,6 @@ public class RecoveryTarget extends AbstractComponent {
         void onRecoveryFailure(RecoveryFailedException e, boolean sendShardFailure);
     }
 
-    @Nullable
-    private RecoveryStatus findRecoveryByShardId(ShardId shardId) {
-        for (RecoveryStatus recoveryStatus : onGoingRecoveries.values()) {
-            if (recoveryStatus.shardId.equals(shardId)) {
-                return recoveryStatus;
-            }
-        }
-        return null;
-    }
-
     @Nullable
     private RecoveryStatus findRecoveryByShard(IndexShard indexShard) {
         for (RecoveryStatus recoveryStatus : onGoingRecoveries.values()) {