Internal: made it possible to disable the main transport handler in TransportShardSingleOperationAction

TransportShardSingleOperationAction is currently subclassed by different transport actions. Some of them are internal only, meaning that their execution will take place only in the same node where their parent execution took place. That means that their main transport handler doesn't need to be registered, the only transport handler that's needed is the shard level one.

Added `isSubAction` method (defaults to false) to the parent class that tells whether the action is a main one or a subaction, used to decide whether we need to register the main transport handler.

Closes #7285

Author: javanna

src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java

@@ -57,6 +57,11 @@ public TransportShardMultiGetAction(Settings settings, ClusterService clusterSer
         this.realtime = settings.getAsBoolean("action.get.realtime", true);
     }
 
+    @Override
+    protected boolean isSubAction() {
+        return true;
+    }
+
     @Override
     protected String executor() {
         return ThreadPool.Names.GET;

src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java

@@ -59,6 +59,11 @@ public TransportShardMultiPercolateAction(Settings settings, ThreadPool threadPo
         this.percolatorService = percolatorService;
     }
 
+    @Override
+    protected boolean isSubAction() {
+        return true;
+    }
+
     @Override
     protected String executor() {
         return ThreadPool.Names.PERCOLATE;

src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java

@@ -67,10 +67,21 @@ protected TransportShardSingleOperationAction(Settings settings, String actionNa
         this.transportShardAction = actionName + "[s]";
         this.executor = executor();
 
-        transportService.registerHandler(actionName, new TransportHandler());
+        if (!isSubAction()) {
+            transportService.registerHandler(actionName, new TransportHandler());
+        }
         transportService.registerHandler(transportShardAction, new ShardTransportHandler());
     }
 
+    /**
+     * Tells whether the action is a main one or a subaction. Used to decide whether we need to register
+     * the main transport handler. In fact if the action is a subaction, its execute method
+     * will be called locally to its parent action.
+     */
+    protected boolean isSubAction() {
+        return false;
+    }
+
     @Override
     protected void doExecute(Request request, ActionListener<Response> listener) {
         new AsyncSingleAction(request, listener).start();

src/main/java/org/elasticsearch/action/termvector/TransportSingleShardMultiTermsVectorAction.java

@@ -49,6 +49,11 @@ public TransportSingleShardMultiTermsVectorAction(Settings settings, ClusterServ
         this.indicesService = indicesService;
     }
 
+    @Override
+    protected boolean isSubAction() {
+        return true;
+    }
+
     @Override
     protected String executor() {
         return ThreadPool.Names.GET;

src/main/java/org/elasticsearch/transport/ActionNames.java

@@ -230,7 +230,7 @@ private static ImmutableBiMap<String, String> createActionNamesMap() {
         addShardAction(ExplainAction.NAME, "explain", builder);
         addShardAction(GetAction.NAME, "get", builder);
         builder.put(MultiGetAction.NAME, "mget");
-        addShardAction(MultiGetAction.NAME + "[shard]", "mget/shard", builder);
+        builder.put(MultiGetAction.NAME + "[shard][s]", "mget/shard/s");
 
         builder.put(GetIndexedScriptAction.NAME, "getIndexedScript");
         builder.put(PutIndexedScriptAction.NAME, "putIndexedScript");
@@ -239,12 +239,12 @@ private static ImmutableBiMap<String, String> createActionNamesMap() {
         builder.put(MoreLikeThisAction.NAME, "mlt");
 
         builder.put(MultiPercolateAction.NAME, "mpercolate");
-        addShardAction(MultiPercolateAction.NAME + "[shard]", "mpercolate/shard", builder);
+        builder.put(MultiPercolateAction.NAME + "[shard][s]", "mpercolate/shard/s");
 
         builder.put(MultiSearchAction.NAME, "msearch");
 
         builder.put(MultiTermVectorsAction.NAME, "mtv");
-        addShardAction(MultiTermVectorsAction.NAME + "[shard]", "mtv/shard", builder);
+        builder.put(MultiTermVectorsAction.NAME + "[shard][s]", "mtv/shard/s");
 
         addShardAction(PercolateAction.NAME, "percolate", builder);