From fbd351a3d8a300c0729aa890762e8ddd39c5bb00 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 20 May 2019 15:01:47 +0100 Subject: [PATCH] Remove options that don't make sense when starting a solr node. --- .../java/org/alfresco/solr/AlfrescoCoreAdminHandler.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java index 6f7663c1b..559ec6855 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java @@ -99,9 +99,6 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler public static final String DATA_DIR_ROOT = "data.dir.root"; public static final String ALFRESCO_DEFAULTS = "create.alfresco.defaults"; public static final String NUM_SHARDS = "num.shards"; - public static final String REPLICATION_FACTOR = "replication.factor"; - public static final String NODE_INSTANCE = "node.instance"; - public static final String NUM_NODES = "num.nodes"; public static final String SHARD_IDS = "shard.ids"; public static final String DEFAULT_TEMPLATE = "rerank"; @@ -141,9 +138,6 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler String createDefaultCores = ConfigUtil.locateProperty(ALFRESCO_DEFAULTS, ""); int numShards = Integer.valueOf(ConfigUtil.locateProperty(NUM_SHARDS, "1")); - int replicationFactor = Integer.valueOf(ConfigUtil.locateProperty(REPLICATION_FACTOR, "1")); - int nodeInstance = Integer.valueOf(ConfigUtil.locateProperty(NODE_INSTANCE, "1")); - int numNodes = Integer.valueOf(ConfigUtil.locateProperty(NUM_NODES, "1")); String shardIds = ConfigUtil.locateProperty(SHARD_IDS, null); if (createDefaultCores != null && !createDefaultCores.isEmpty()) { @@ -157,7 +151,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler { //Don't care } - setupNewDefaultCores(createDefaultCores, numShards, replicationFactor, nodeInstance, numNodes, shardIds); + setupNewDefaultCores(createDefaultCores, numShards, 1, 1, 1, shardIds); }; Thread thread = new Thread(runnable);