From c92207f483cbcea8985d054a0d42cda8b93cfd79 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 19 Mar 2013 10:22:43 +0100
Subject: [PATCH] broadcast API to by default ignore missing / illegal shard
 state this happens for example because we list assigned shards, and they
 might not have been allocated on the relevant node yet, no need to list those
 as actual failures in some APIs

---
 .../refresh/TransportRefreshAction.java       | 19 ------------
 .../TransportBroadcastOperationAction.java    | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
index c894e4f94c5..378653625b0 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.action.admin.indices.refresh;
 
 import org.elasticsearch.ElasticSearchException;
-import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
@@ -33,11 +32,8 @@ import org.elasticsearch.cluster.routing.GroupShardsIterator;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.IndexShardMissingException;
 import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.shard.IllegalIndexShardStateException;
 import org.elasticsearch.index.shard.service.IndexShard;
-import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
@@ -81,21 +77,6 @@ public class TransportRefreshAction extends TransportBroadcastOperationAction<Re
         return true;
     }
 
-    @Override
-    protected boolean ignoreException(Throwable t) {
-        Throwable actual = ExceptionsHelper.unwrapCause(t);
-        if (actual instanceof IllegalIndexShardStateException) {
-            return true;
-        }
-        if (actual instanceof IndexMissingException) {
-            return true;
-        }
-        if (actual instanceof IndexShardMissingException) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     protected RefreshResponse newResponse(RefreshRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
index 3b811257caa..8aff54f80e4 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.action.support.broadcast;
 
 import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.TransportAction;
 import org.elasticsearch.cluster.ClusterService;
@@ -32,6 +33,9 @@ import org.elasticsearch.cluster.routing.ShardIterator;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.IndexShardMissingException;
+import org.elasticsearch.index.shard.IllegalIndexShardStateException;
+import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.*;
 
@@ -95,14 +99,41 @@ public abstract class TransportBroadcastOperationAction<Request extends Broadcas
         return true;
     }
 
+    /**
+     * Override this method to ignore specific exception, note, the result should be OR'ed with the call
+     * to super#ignoreException since there is additional logic here....
+     */
     protected boolean ignoreException(Throwable t) {
+        if (ignoreIllegalShardState()) {
+            Throwable actual = ExceptionsHelper.unwrapCause(t);
+            if (actual instanceof IllegalIndexShardStateException) {
+                return true;
+            }
+            if (actual instanceof IndexMissingException) {
+                return true;
+            }
+            if (actual instanceof IndexShardMissingException) {
+                return true;
+            }
+        }
         return false;
     }
 
+    /**
+     * Should non active routing shard state be ignore or node, defaults to false.
+     */
     protected boolean ignoreNonActiveExceptions() {
         return false;
     }
 
+    /**
+     * Should the API ignore illegal shard state cases, for example, if the shard is actually missing on the
+     * target node (cause it hasn't been allocated there for example). Defaults to true.
+     */
+    protected boolean ignoreIllegalShardState() {
+        return true;
+    }
+
     protected abstract ClusterBlockException checkGlobalBlock(ClusterState state, Request request);
 
     protected abstract ClusterBlockException checkRequestBlock(ClusterState state, Request request, String[] concreteIndices);