diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocation.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocation.java
index 1a8f429a4b5..c4906a51880 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocation.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocation.java
@@ -31,11 +31,15 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 public interface NodeAllocation {
 
     enum Decision {
-        ALLOWED {
+        YES {
             @Override boolean allocate() {
                 return true;
             }},
-        DISALLOWED {
+        NO {
+            @Override boolean allocate() {
+                return false;
+            }},
+        THROTTLE {
             @Override boolean allocate() {
                 return false;
             }};
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocations.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocations.java
index 5d7f8d4133c..bb26f647f2d 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocations.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocations.java
@@ -52,12 +52,15 @@ public class NodeAllocations extends AbstractComponent implements NodeAllocation
     }
 
     @Override public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, RoutingNodes routingNodes) {
+        Decision ret = Decision.YES;
         for (NodeAllocation allocation : allocations) {
             Decision decision = allocation.canAllocate(shardRouting, node, routingNodes);
-            if (decision == Decision.DISALLOWED) {
-                return Decision.DISALLOWED;
+            if (decision == Decision.NO) {
+                return Decision.NO;
+            } else if (decision == Decision.THROTTLE) {
+                ret = Decision.THROTTLE;
             }
         }
-        return Decision.ALLOWED;
+        return ret;
     }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ReplicaAfterPrimaryActiveNodeAllocation.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ReplicaAfterPrimaryActiveNodeAllocation.java
index 28f95413e27..a3a4142ccff 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ReplicaAfterPrimaryActiveNodeAllocation.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ReplicaAfterPrimaryActiveNodeAllocation.java
@@ -40,12 +40,12 @@ public class ReplicaAfterPrimaryActiveNodeAllocation extends AbstractComponent i
 
     @Override public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, RoutingNodes routingNodes) {
         if (shardRouting.primary()) {
-            return Decision.ALLOWED;
+            return Decision.YES;
         }
         MutableShardRouting primary = routingNodes.findPrimaryForReplica(shardRouting);
         if (primary == null || !primary.active()) {
-            return Decision.DISALLOWED;
+            return Decision.NO;
         }
-        return Decision.ALLOWED;
+        return Decision.YES;
     }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/SameShardNodeAllocation.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/SameShardNodeAllocation.java
index 63d7e40fd95..31cb98418ea 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/SameShardNodeAllocation.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/SameShardNodeAllocation.java
@@ -42,9 +42,9 @@ public class SameShardNodeAllocation extends AbstractComponent implements NodeAl
         for (MutableShardRouting current : node.shards()) {
             // we do not allow for two shards of the same shard id to exists on the same node
             if (current.shardId().equals(shardRouting.shardId())) {
-                return Decision.DISALLOWED;
+                return Decision.NO;
             }
         }
-        return Decision.ALLOWED;
+        return Decision.YES;
     }
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationModule.java
index a8c945dd611..8ff9101e90c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationModule.java
@@ -33,6 +33,7 @@ public class ShardAllocationModule extends AbstractModule {
 
         Multibinder<NodeAllocation> decidersBinder = Multibinder.newSetBinder(binder(), NodeAllocation.class);
         decidersBinder.addBinding().to(SameShardNodeAllocation.class);
+        decidersBinder.addBinding().to(ReplicaAfterPrimaryActiveNodeAllocation.class);
 
         bind(NodeAllocations.class).asEagerSingleton();
     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
index 48757967693..b6032a33e89 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
@@ -27,6 +27,7 @@ import org.elasticsearch.action.support.nodes.*;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -89,6 +90,19 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
         return new NodeStoreFilesMetaData();
     }
 
+    /**
+     * We only need to ask data nodes for shard allocation information.
+     */
+    @Override protected String[] filterNodeIds(DiscoveryNodes nodes, String[] nodesIds) {
+        List<String> dataNodeIds = Lists.newArrayList();
+        for (String nodeId : nodesIds) {
+            if (nodes.get(nodeId).dataNode()) {
+                dataNodeIds.add(nodeId);
+            }
+        }
+        return dataNodeIds.toArray(new String[dataNodeIds.size()]);
+    }
+
     @Override protected NodesStoreFilesMetaData newResponse(Request request, AtomicReferenceArray responses) {
         final List<NodeStoreFilesMetaData> nodeStoreFilesMetaDatas = Lists.newArrayList();
         final List<FailedNodeException> failures = Lists.newArrayList();