reafactor how actions handle failures, better response when non activ…

…e shards exists, also, default logging to have action set to DEBUG so exceptions in actions are logged in the server
DaveCTurner · Apr 6, 2010 · 2bb31fe · 2bb31fe
1 parent 1a9c5d6
commit 2bb31fe
Show file tree

Hide file tree

Showing 42 changed files with 628 additions and 239 deletions.
diff --git a/config/logging.yml b/config/logging.yml
@@ -1,6 +1,8 @@
 rootLogger: INFO, console, file
 logger:
   jgroups: WARN
+  # log action execution errors for easier debugging
+  action : DEBUG
 
 appender:
   console:

diff --git a/...elasticsearch/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java b/...elasticsearch/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java
@@ -27,6 +27,10 @@
  */
 public class NoShardAvailableActionException extends IndexShardException {
 
+    public NoShardAvailableActionException(ShardId shardId, String msg) {
+        super(shardId, msg);
+    }
+
     public NoShardAvailableActionException(ShardId shardId, String msg, Throwable cause) {
         super(shardId, msg, cause);
     }

diff --git a/...ain/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java b/...ain/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingResponse.java
@@ -36,8 +36,8 @@ public class BroadcastPingResponse extends BroadcastOperationResponse {
 
     }
 
-    public BroadcastPingResponse(int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    public BroadcastPingResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
     }
 
     @Override public void readFrom(StreamInput in) throws IOException {

diff --git a/...a/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java b/...a/org/elasticsearch/action/admin/cluster/ping/broadcast/TransportBroadcastPingAction.java
@@ -83,7 +83,7 @@ public class TransportBroadcastPingAction extends TransportBroadcastOperationAct
                 successfulShards++;
             }
         }
-        return new BroadcastPingResponse(successfulShards, failedShards, shardFailures);
+        return new BroadcastPingResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected BroadcastShardPingRequest newShardRequest() {

diff --git a/.../org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java b/.../org/elasticsearch/action/admin/cluster/ping/replication/ShardReplicationPingRequest.java
@@ -58,4 +58,8 @@ public int shardId() {
         super.writeTo(out);
         out.writeVInt(shardId);
     }
+
+    @Override public String toString() {
+        return "[" + index + "][" + shardId + "]";
+    }
 }
diff --git a/...in/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/...in/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
@@ -38,8 +38,8 @@ public class ClearIndicesCacheResponse extends BroadcastOperationResponse {
 
     }
 
-    ClearIndicesCacheResponse(int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    ClearIndicesCacheResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
     }
 
     @Override public void readFrom(StreamInput in) throws IOException {

diff --git a/.../org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/.../org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
@@ -66,14 +66,18 @@ public class TransportClearIndicesCacheAction extends TransportBroadcastOperatio
         return new ClearIndicesCacheRequest();
     }
 
+    @Override protected boolean ignoreNonActiveExceptions() {
+        return true;
+    }
+
     @Override protected ClearIndicesCacheResponse newResponse(ClearIndicesCacheRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
         int failedShards = 0;
         List<ShardOperationFailedException> shardFailures = null;
         for (int i = 0; i < shardsResponses.length(); i++) {
             Object shardResponse = shardsResponses.get(i);
             if (shardResponse == null) {
-                failedShards++;
+                // simply ignore non active shards
             } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
                 failedShards++;
                 if (shardFailures == null) {
@@ -84,7 +88,7 @@ public class TransportClearIndicesCacheAction extends TransportBroadcastOperatio
                 successfulShards++;
             }
         }
-        return new ClearIndicesCacheResponse(successfulShards, failedShards, shardFailures);
+        return new ClearIndicesCacheResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected ShardClearIndicesCacheRequest newShardRequest() {

diff --git a/...asticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/...asticsearch/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
@@ -38,8 +38,8 @@ public class FlushResponse extends BroadcastOperationResponse {
 
     }
 
-    FlushResponse(int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    FlushResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
     }
 
     @Override public void readFrom(StreamInput in) throws IOException {

diff --git a/...arch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/...arch/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
@@ -65,14 +65,18 @@ public class TransportFlushAction extends TransportBroadcastOperationAction<Flus
         return new FlushRequest();
     }
 
+    @Override protected boolean ignoreNonActiveExceptions() {
+        return true;
+    }
+
     @Override protected FlushResponse newResponse(FlushRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
         int failedShards = 0;
         List<ShardOperationFailedException> shardFailures = null;
         for (int i = 0; i < shardsResponses.length(); i++) {
             Object shardResponse = shardsResponses.get(i);
             if (shardResponse == null) {
-                failedShards++;
+                // a non active shard, ignore
             } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
                 failedShards++;
                 if (shardFailures == null) {
@@ -83,7 +87,7 @@ public class TransportFlushAction extends TransportBroadcastOperationAction<Flus
                 successfulShards++;
             }
         }
-        return new FlushResponse(successfulShards, failedShards, shardFailures);
+        return new FlushResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected ShardFlushRequest newShardRequest() {

diff --git a/.../org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java b/.../org/elasticsearch/action/admin/indices/gateway/snapshot/ShardGatewaySnapshotRequest.java
@@ -58,4 +58,8 @@ public int shardId() {
         super.writeTo(out);
         out.writeVInt(shardId);
     }
+
+    @Override public String toString() {
+        return "[" + index + "][" + shardId + "]";
+    }
 }
diff --git a/...earch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java b/...earch/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
@@ -38,8 +38,8 @@ public class OptimizeResponse extends BroadcastOperationResponse {
 
     }
 
-    OptimizeResponse(int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    OptimizeResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
     }
 
     @Override public void readFrom(StreamInput in) throws IOException {

diff --git a/...rc/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/...rc/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
@@ -66,14 +66,18 @@ public class TransportOptimizeAction extends TransportBroadcastOperationAction<O
         return new OptimizeRequest();
     }
 
+    @Override protected boolean ignoreNonActiveExceptions() {
+        return true;
+    }
+
     @Override protected OptimizeResponse newResponse(OptimizeRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
         int failedShards = 0;
         List<ShardOperationFailedException> shardFailures = null;
         for (int i = 0; i < shardsResponses.length(); i++) {
             Object shardResponse = shardsResponses.get(i);
             if (shardResponse == null) {
-                failedShards++;
+                // a non active shard, ignore...
             } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
                 failedShards++;
                 if (shardFailures == null) {
@@ -84,7 +88,7 @@ public class TransportOptimizeAction extends TransportBroadcastOperationAction<O
                 successfulShards++;
             }
         }
-        return new OptimizeResponse(successfulShards, failedShards, shardFailures);
+        return new OptimizeResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected ShardOptimizeRequest newShardRequest() {

diff --git a/...csearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/...csearch/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
@@ -38,8 +38,8 @@ public class RefreshResponse extends BroadcastOperationResponse {
 
     }
 
-    RefreshResponse(int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    RefreshResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
     }
 
     @Override public void readFrom(StreamInput in) throws IOException {

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
@@ -66,14 +66,18 @@ public class TransportRefreshAction extends TransportBroadcastOperationAction<Re
         return new RefreshRequest();
     }
 
+    @Override protected boolean ignoreNonActiveExceptions() {
+        return true;
+    }
+
     @Override protected RefreshResponse newResponse(RefreshRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
         int failedShards = 0;
         List<ShardOperationFailedException> shardFailures = null;
         for (int i = 0; i < shardsResponses.length(); i++) {
             Object shardResponse = shardsResponses.get(i);
             if (shardResponse == null) {
-                failedShards++;
+                // non active shard, ignore
             } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
                 failedShards++;
                 if (shardFailures == null) {
@@ -84,7 +88,7 @@ public class TransportRefreshAction extends TransportBroadcastOperationAction<Re
                 successfulShards++;
             }
         }
-        return new RefreshResponse(successfulShards, failedShards, shardFailures);
+        return new RefreshResponse(shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected ShardRefreshRequest newShardRequest() {

diff --git a/...ch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java b/...ch/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusResponse.java
@@ -37,7 +37,7 @@
 import static org.elasticsearch.util.settings.ImmutableSettings.*;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public class IndicesStatusResponse extends BroadcastOperationResponse {
 
@@ -50,8 +50,8 @@ public class IndicesStatusResponse extends BroadcastOperationResponse {
     IndicesStatusResponse() {
     }
 
-    IndicesStatusResponse(ShardStatus[] shards, ClusterState clusterState, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    IndicesStatusResponse(ShardStatus[] shards, ClusterState clusterState, int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
         this.shards = shards;
         indicesSettings = newHashMap();
         for (ShardStatus shard : shards) {

diff --git a/...main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java b/...main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java
@@ -45,7 +45,7 @@
 import static com.google.common.collect.Lists.*;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public class TransportIndicesStatusAction extends TransportBroadcastOperationAction<IndicesStatusRequest, IndicesStatusResponse, TransportIndicesStatusAction.IndexShardStatusRequest, ShardStatus> {
 
@@ -65,6 +65,10 @@ public class TransportIndicesStatusAction extends TransportBroadcastOperationAct
         return new IndicesStatusRequest();
     }
 
+    @Override protected boolean ignoreNonActiveExceptions() {
+        return true;
+    }
+
     @Override protected IndicesStatusResponse newResponse(IndicesStatusRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
         int successfulShards = 0;
         int failedShards = 0;
@@ -73,7 +77,7 @@ public class TransportIndicesStatusAction extends TransportBroadcastOperationAct
         for (int i = 0; i < shardsResponses.length(); i++) {
             Object shardResponse = shardsResponses.get(i);
             if (shardResponse == null) {
-                failedShards++;
+                // simply ignore non active shards
             } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
                 failedShards++;
                 if (shardFailures == null) {
@@ -85,7 +89,7 @@ public class TransportIndicesStatusAction extends TransportBroadcastOperationAct
                 successfulShards++;
             }
         }
-        return new IndicesStatusResponse(shards.toArray(new ShardStatus[shards.size()]), clusterState, successfulShards, failedShards, shardFailures);
+        return new IndicesStatusResponse(shards.toArray(new ShardStatus[shards.size()]), clusterState, shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected IndexShardStatusRequest newShardRequest() {

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java
@@ -201,6 +201,6 @@ public CountRequest types(String... types) {
     }
 
     @Override public String toString() {
-        return "[" + Arrays.toString(indices) + "][" + Arrays.toString(types) + "], querySource[" + Unicode.fromBytes(querySource) + "]";
+        return "[" + Arrays.toString(indices) + "]" + Arrays.toString(types) + ", querySource[" + Unicode.fromBytes(querySource) + "]";
     }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountResponse.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountResponse.java
@@ -40,8 +40,8 @@ public class CountResponse extends BroadcastOperationResponse {
 
     }
 
-    CountResponse(long count, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(successfulShards, failedShards, shardFailures);
+    CountResponse(long count, int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
         this.count = count;
     }
 

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
@@ -98,7 +98,7 @@ public class TransportCountAction extends TransportBroadcastOperationAction<Coun
                 successfulShards++;
             }
         }
-        return new CountResponse(count, successfulShards, failedShards, shardFailures);
+        return new CountResponse(count, shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override protected ShardCountResponse shardOperation(ShardCountRequest request) throws ElasticSearchException {

diff --git a/...earch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java b/...earch/src/main/java/org/elasticsearch/action/deletebyquery/ShardDeleteByQueryRequest.java
@@ -23,10 +23,12 @@
 import org.elasticsearch.action.support.replication.ShardReplicationOperationRequest;
 import org.elasticsearch.util.Nullable;
 import org.elasticsearch.util.Strings;
+import org.elasticsearch.util.Unicode;
 import org.elasticsearch.util.io.stream.StreamInput;
 import org.elasticsearch.util.io.stream.StreamOutput;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import static org.elasticsearch.action.Actions.*;
 
@@ -115,4 +117,8 @@ public String[] types() {
             out.writeUTF(type);
         }
     }
+
+    @Override public String toString() {
+        return "[" + index + "]" + Arrays.toString(types) + ", query [" + Unicode.fromBytes(querySource) + "]";
+    }
 }