From d25c939b9795a5a857eef4f41a3a59bb268ce6e4 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Wed, 10 Aug 2011 20:29:24 +0300
Subject: [PATCH] Failed shard recovery can cause shard data to be deleted
 (replicas will still work), closes #1227.

---
 .../indices/cluster/IndicesClusterStateService.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
index a6e04963924..967d0420adb 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -281,10 +281,12 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
                             }
                             indexService.removeShard(existingShardId, "removing shard (index is closed)");
                         } else {
+                            // we can just remove the shard, without cleaning it locally, since we will clean it
+                            // when all shards are allocated in the IndicesStore
                             if (logger.isDebugEnabled()) {
-                                logger.debug("[{}][{}] cleaning shard locally (not allocated)", index, existingShardId);
+                                logger.debug("[{}][{}] removing shard (not allocated)", index, existingShardId);
                             }
-                            indexService.cleanShard(existingShardId, "cleaning shard locally (not allocated)");
+                            indexService.removeShard(existingShardId, "removing shard (not allocated)");
                         }
                     }
                 }