release 2.1.1-14

strapdata · Jul 1, 2016 · d29e3e5 · d29e3e5
1 parent 199f3ac
commit d29e3e5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/elasticsearch/cassandra/cluster/InternalCassandraClusterService.java b/src/main/java/org/elasticsearch/cassandra/cluster/InternalCassandraClusterService.java
@@ -713,11 +713,11 @@ public ClusterState updateNumberOfShards(ClusterState currentState) {
             String keyspace = indexMetaData.getSettings().get(IndexMetaData.SETTING_KEYSPACE,indexMetaData.getIndex());
             if (Schema.instance != null && Schema.instance.getKeyspaceInstance(keyspace) != null) {
                 AbstractReplicationStrategy replicationStrategy = Schema.instance.getKeyspaceInstance(keyspace).getReplicationStrategy();
+                int rf = replicationStrategy.getReplicationFactor();
                 if (replicationStrategy instanceof IDistributedReplicationStrategy) {
-                    indexMetaDataBuilder.numberOfReplicas( ((IDistributedReplicationStrategy)replicationStrategy).getReplicationFactor(DatabaseDescriptor.getLocalDataCenter()) - 1 );
-                } else {
-                    indexMetaDataBuilder.numberOfReplicas( replicationStrategy.getReplicationFactor() - 1 );
-                }
+                    rf = ((IDistributedReplicationStrategy)replicationStrategy).getReplicationFactor(DatabaseDescriptor.getLocalDataCenter());
+                } 
+                indexMetaDataBuilder.numberOfReplicas( Math.max(0,  rf -1) );
             } else {
                 indexMetaDataBuilder.numberOfReplicas( 0 );
             }