This is an automated email from the ASF dual-hosted git repository.
psalagnac pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 26374c177bd SOLR-17779: Remove 'roles' and 'numShards' core properties
(#3420)
26374c177bd is described below
commit 26374c177bd4711cf2c6c2f5971ad0813e554c6f
Author: Pierre Salagnac <[email protected]>
AuthorDate: Fri Jul 18 19:01:25 2025 +0200
SOLR-17779: Remove 'roles' and 'numShards' core properties (#3420)
This removes old core properties that are still stored in core.properties
files but never read.
Also cleanup the SolrJ part.
---
solr/CHANGES.txt | 2 ++
.../solr/client/api/model/CreateCoreParams.java | 3 ---
.../org/apache/solr/cloud/CloudDescriptor.java | 28 ----------------------
.../java/org/apache/solr/cloud/ZkController.java | 5 ----
.../java/org/apache/solr/core/CoreDescriptor.java | 5 +---
.../apache/solr/handler/admin/ClusterStatus.java | 3 ++-
.../solr/handler/admin/CoreAdminHandler.java | 3 ---
.../apache/solr/handler/admin/api/CreateCore.java | 11 ---------
.../test/org/apache/solr/cloud/OverseerTest.java | 20 ----------------
.../solr/cloud/TestRandomRequestDistribution.java | 2 --
.../solr/handler/admin/V2CoresAPIMappingTest.java | 4 ----
.../apache/solr/common/cloud/ZkStateReader.java | 1 -
.../client/solrj/request/CoreAdminRequest.java | 12 ----------
.../apache/solr/common/params/CoreAdminParams.java | 2 --
.../cloud/AbstractBasicDistributedZkTestBase.java | 1 -
15 files changed, 5 insertions(+), 97 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2ca073e8ef8..56954f218e5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -135,6 +135,8 @@ Deprecation Removals
* SOLR-17778: Removed no-op core admin operation FORCEPREPAREFORLEADERSHIP and
its SolrJ peer OverrideLastPublished. (Pierre Salagnac)
+* SOLR-17779: Removed obsolete 'roles' and 'numShards' core properties, which
were persisted with but unused (Pierre Salagnac).
+
Dependency Upgrades
---------------------
diff --git
a/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.java
b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.java
index 49de4b7fd5a..80337968fd4 100644
--- a/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.java
+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.java
@@ -18,7 +18,6 @@ package org.apache.solr.client.api.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.List;
import java.util.Map;
public class CreateCoreParams {
@@ -47,8 +46,6 @@ public class CreateCoreParams {
@JsonProperty public String collection;
- @JsonProperty public List<String> roles;
-
@JsonProperty public String replicaType;
@JsonProperty public Map<String, String> properties;
diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
index f26819aa021..6313ece2697 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.util.PropertiesUtil;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.CoreDescriptor;
@@ -31,8 +30,6 @@ public class CloudDescriptor {
private String shardId;
private String collectionName;
- private String roles = null;
- private Integer numShards;
private String nodeName = null;
private Map<String, String> collectionParams = new HashMap<>();
@@ -43,8 +40,6 @@ public class CloudDescriptor {
private volatile boolean hasRegistered = false;
private volatile Replica.State lastPublished = Replica.State.ACTIVE;
- public static final String NUM_SHARDS = "numShards";
-
public static final String REPLICA_TYPE = "replicaType";
/** The type of replica this core hosts */
@@ -56,10 +51,8 @@ public class CloudDescriptor {
if (StrUtils.isNullOrEmpty(shardId)) this.shardId = null;
// If no collection name is specified, we default to the core name
this.collectionName = props.getProperty(CoreDescriptor.CORE_COLLECTION,
coreName);
- this.roles = props.getProperty(CoreDescriptor.CORE_ROLES, null);
this.nodeName = props.getProperty(CoreDescriptor.CORE_NODE_NAME);
if (StrUtils.isNullOrEmpty(nodeName)) this.nodeName = null;
- this.numShards =
PropertiesUtil.toInteger(props.getProperty(CloudDescriptor.NUM_SHARDS), null);
this.replicaType =
Replica.Type.get(props.getProperty(CloudDescriptor.REPLICA_TYPE));
for (String propName : props.stringPropertyNames()) {
if (propName.startsWith(ZkController.COLLECTION_PARAM_PREFIX)) {
@@ -110,28 +103,11 @@ public class CloudDescriptor {
this.collectionName = collectionName;
}
- public String getRoles() {
- return roles;
- }
-
- public void setRoles(String roles) {
- this.roles = roles;
- }
-
/** Optional parameters that can change how a core is created. */
public Map<String, String> getParams() {
return collectionParams;
}
- // setting only matters on core creation
- public Integer getNumShards() {
- return numShards;
- }
-
- public void setNumShards(int numShards) {
- this.numShards = numShards;
- }
-
public String getCoreNodeName() {
return nodeName;
}
@@ -152,10 +128,6 @@ public class CloudDescriptor {
StrUtils.isNullOrEmpty(reloadFrom.getCollectionName())
? getCollectionName()
: reloadFrom.getCollectionName());
- setRoles(StrUtils.isNullOrEmpty(reloadFrom.getRoles()) ? getRoles() :
reloadFrom.getRoles());
- if (reloadFrom.getNumShards() != null) {
- setNumShards(reloadFrom.getNumShards());
- }
setCoreNodeName(
StrUtils.isNullOrEmpty(reloadFrom.getCoreNodeName())
? getCoreNodeName()
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index ba6798651ce..511ee08ea48 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1755,7 +1755,6 @@ public class ZkController implements Closeable {
log.debug("publishing state={}", state);
// System.out.println(Thread.currentThread().getStackTrace()[3]);
- Integer numShards = cd.getCloudDescriptor().getNumShards();
assert collection != null && collection.length() > 0;
@@ -1768,7 +1767,6 @@ public class ZkController implements Closeable {
props.put(Overseer.QUEUE_OPERATION,
OverseerAction.STATE.toLower());
props.put(ZkStateReader.STATE_PROP, state.toString());
props.put(ZkStateReader.CORE_NAME_PROP, cd.getName());
- props.put(ZkStateReader.ROLES_PROP,
cd.getCloudDescriptor().getRoles());
props.put(ZkStateReader.NODE_NAME_PROP, getNodeName());
props.put(
ZkStateReader.BASE_URL_PROP,
zkStateReader.getBaseUrlForNodeName(getNodeName()));
@@ -1777,9 +1775,6 @@ public class ZkController implements Closeable {
props.put(
ZkStateReader.REPLICA_TYPE,
cd.getCloudDescriptor().getReplicaType().toString());
props.put(ZkStateReader.FORCE_SET_STATE_PROP, "false");
- if (numShards != null) {
- props.put(ZkStateReader.NUM_SHARDS_PROP, numShards.toString());
- }
props.putIfNotNull(ZkStateReader.CORE_NODE_NAME_PROP,
coreNodeName);
};
diff --git a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
index 87599b711d8..5785b43017b 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
@@ -54,7 +54,6 @@ public class CoreDescriptor {
public static final String CORE_SCHEMA = "schema";
public static final String CORE_SHARD = "shard";
public static final String CORE_COLLECTION = "collection";
- public static final String CORE_ROLES = "roles";
public static final String CORE_PROPERTIES = "properties";
public static final String CORE_LOADONSTARTUP = "loadOnStartup";
public static final String CORE_TRANSIENT = "transient";
@@ -110,9 +109,7 @@ public class CoreDescriptor {
// cloud props
CORE_SHARD,
CORE_COLLECTION,
- CORE_ROLES,
- CORE_NODE_NAME,
- CloudDescriptor.NUM_SHARDS);
+ CORE_NODE_NAME);
private final CloudDescriptor cloudDesc;
diff --git
a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
index 6ef549698d3..195a3f66087 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
@@ -51,6 +51,7 @@ public class ClusterStatus {
public static final String INCLUDE_ALL = "includeAll";
public static final String LIVENODES_PROP = "liveNodes";
public static final String CLUSTER_PROP = "clusterProperties";
+ public static final String ROLES_PROP = "roles";
public static final String ALIASES_PROP = "aliases";
/** Shard / collection health state. */
@@ -108,7 +109,7 @@ public class ClusterStatus {
boolean includeAll = solrParams.getBool(INCLUDE_ALL, true);
boolean withLiveNodes = solrParams.getBool(LIVENODES_PROP, includeAll);
boolean withClusterProperties = solrParams.getBool(CLUSTER_PROP,
includeAll);
- boolean withRoles = solrParams.getBool(ZkStateReader.ROLES_PROP,
includeAll);
+ boolean withRoles = solrParams.getBool(ROLES_PROP, includeAll);
boolean withCollection = includeAll || (collection != null);
boolean withAliases = solrParams.getBool(ALIASES_PROP, includeAll);
diff --git
a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index b073bc1bf5f..86c68759774 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -42,7 +42,6 @@ import org.apache.solr.api.JerseyResource;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -271,9 +270,7 @@ public class CoreAdminHandler extends RequestHandlerBase
implements PermissionNa
Map.entry(CoreAdminParams.TRANSIENT, CoreDescriptor.CORE_TRANSIENT),
Map.entry(CoreAdminParams.SHARD, CoreDescriptor.CORE_SHARD),
Map.entry(CoreAdminParams.COLLECTION,
CoreDescriptor.CORE_COLLECTION),
- Map.entry(CoreAdminParams.ROLES, CoreDescriptor.CORE_ROLES),
Map.entry(CoreAdminParams.CORE_NODE_NAME,
CoreDescriptor.CORE_NODE_NAME),
- Map.entry(ZkStateReader.NUM_SHARDS_PROP, CloudDescriptor.NUM_SHARDS),
Map.entry(CoreAdminParams.REPLICA_TYPE,
CloudDescriptor.REPLICA_TYPE));
private static Map<String, CoreAdminOp> initializeOpMap() {
diff --git
a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java
b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java
index 14807e3a36a..289d51d68c4 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java
@@ -21,7 +21,6 @@ import static
org.apache.solr.cloud.ZkController.COLLECTION_PARAM_PREFIX;
import static
org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;
import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
import static org.apache.solr.common.params.CoreAdminParams.ACTION;
-import static org.apache.solr.common.params.CoreAdminParams.ROLES;
import static org.apache.solr.handler.admin.CoreAdminHandler.paramToProp;
import static
org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;
@@ -31,7 +30,6 @@ import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.solr.client.api.endpoint.CoreApis;
import org.apache.solr.client.api.model.CreateCoreParams;
@@ -40,7 +38,6 @@ import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.CollectionUtil;
import org.apache.solr.common.util.PropertiesUtil;
-import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.handler.admin.CoreAdminHandler;
@@ -138,11 +135,6 @@ public class CreateCore extends CoreAdminAPIBase
implements CoreApis.Create {
if (createParamMap.containsKey(entry.getKey())) {
Object value = createParamMap.get(entry.getKey());
if (value != null) {
- if (entry.getKey().equals(ROLES) && value instanceof List) {
- @SuppressWarnings("unchecked")
- final var values = (List<String>) value;
- value = StrUtils.join(values, ',');
- }
coreParams.put(entry.getValue(), value.toString());
}
}
@@ -185,9 +177,6 @@ public class CreateCore extends CoreAdminAPIBase implements
CoreApis.Create {
v1ParamMap.remove(key);
collectionProperties.put(key.substring(COLLECTION_PARAM_PREFIX.length()),
value.toString());
}
- if (key.equals(ROLES)) {
- v1ParamMap.put(ROLES, value.toString().split(","));
- }
}
if (CollectionUtil.isNotEmpty(coreProperties)) {
v1ParamMap.put("properties", coreProperties);
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index bad8d58d021..a48b2eda8d3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -811,8 +811,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"core1",
ZkStateReader.CORE_NODE_NAME_PROP,
"core_node1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
@@ -834,8 +832,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"shard1",
ZkStateReader.CORE_NAME_PROP,
"core1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.ACTIVE.toString());
@@ -1598,8 +1594,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
COLLECTION,
ZkStateReader.CORE_NAME_PROP,
"core1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
queue.offer(m);
@@ -1615,8 +1609,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
COLLECTION,
ZkStateReader.CORE_NAME_PROP,
"core2",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
queue.offer(m);
@@ -1637,8 +1629,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
COLLECTION,
ZkStateReader.CORE_NAME_PROP,
"core3",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
queue.offer(m);
@@ -1700,8 +1690,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"core1",
ZkStateReader.CORE_NODE_NAME_PROP,
"core_node1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.DOWN.toString());
@@ -1722,8 +1710,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"c1",
ZkStateReader.CORE_NAME_PROP,
"core1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
@@ -1741,8 +1727,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"c1",
ZkStateReader.CORE_NAME_PROP,
"core1",
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.ACTIVE.toString());
@@ -2015,8 +1999,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
"core" + N,
ZkStateReader.CORE_NODE_NAME_PROP,
"core_node" + N,
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.RECOVERING.toString());
@@ -2048,8 +2030,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
COLLECTION,
ZkStateReader.CORE_NAME_PROP,
"core" + N,
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.ACTIVE.toString());
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
index 9bf2777975e..9cc1ccace2e 100644
---
a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
+++
b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
@@ -188,8 +188,6 @@ public class TestRandomRequestDistribution extends
AbstractFullDistribZkTestBase
"shard1",
ZkStateReader.CORE_NAME_PROP,
notLeader.getStr(ZkStateReader.CORE_NAME_PROP),
- ZkStateReader.ROLES_PROP,
- "",
ZkStateReader.STATE_PROP,
Replica.State.DOWN.toString());
diff --git
a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
index b67cb982197..b65373c49da 100644
---
a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
+++
b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java
@@ -63,7 +63,6 @@ public class V2CoresAPIMappingTest extends
V2ApiMappingTest<CoreAdminHandler> {
v1Params.add("coreNodeName", "someNodeName");
v1Params.add("newCollection", "true");
v1Params.add("async", "someAsyncId");
- v1Params.add("roles", "role1,role2");
v1Params.add("collection", "someCollection");
v1Params.add("property.foo", "fooVal");
v1Params.add("property.bar", "barVal");
@@ -85,9 +84,6 @@ public class V2CoresAPIMappingTest extends
V2ApiMappingTest<CoreAdminHandler> {
assertEquals(Boolean.TRUE, createRequestBody.isTransient);
assertEquals(Boolean.TRUE, createRequestBody.newCollection);
assertEquals("someNodeName", createRequestBody.coreNodeName);
- assertEquals(2, createRequestBody.roles.size());
- assertEquals("role1", createRequestBody.roles.get(0));
- assertEquals("role2", createRequestBody.roles.get(1));
assertNotNull(createRequestBody.properties);
assertEquals(2, createRequestBody.properties.size());
assertEquals("fooVal", createRequestBody.properties.get("foo"));
diff --git
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index e9a21713d22..9a7e49f01e8 100644
---
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -76,7 +76,6 @@ public class ZkStateReader implements SolrCloseable {
public static final String BASE_URL_PROP = "base_url";
public static final String NODE_NAME_PROP = "node_name";
public static final String CORE_NODE_NAME_PROP = "core_node_name";
- public static final String ROLES_PROP = "roles";
public static final String STATE_PROP = "state";
// if this flag equals to false and the replica does not exist in cluster
state, set state op
// become no op (default is true)
diff --git
a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
index 52d323f936c..88fe9e2e11e 100644
---
a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
+++
b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
@@ -57,7 +57,6 @@ public class CoreAdminRequest extends
SolrRequest<CoreAdminResponse> {
protected String collection;
private Integer numShards;
private String shardId;
- private String roles;
private String coreNodeName;
private Boolean loadOnStartup;
private Boolean isTransient;
@@ -103,10 +102,6 @@ public class CoreAdminRequest extends
SolrRequest<CoreAdminResponse> {
this.shardId = shardId;
}
- public void setRoles(String roles) {
- this.roles = roles;
- }
-
public void setCoreNodeName(String coreNodeName) {
this.coreNodeName = coreNodeName;
}
@@ -156,10 +151,6 @@ public class CoreAdminRequest extends
SolrRequest<CoreAdminResponse> {
return shardId;
}
- public String getRoles() {
- return roles;
- }
-
public String getCoreNodeName() {
return coreNodeName;
}
@@ -226,9 +217,6 @@ public class CoreAdminRequest extends
SolrRequest<CoreAdminResponse> {
if (shardId != null) {
params.set(CoreAdminParams.SHARD, shardId);
}
- if (roles != null) {
- params.set(CoreAdminParams.ROLES, roles);
- }
if (coreNodeName != null) {
params.set(CoreAdminParams.CORE_NODE_NAME, coreNodeName);
}
diff --git
a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
index 9884c60bb74..a3d048bab35 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
@@ -91,8 +91,6 @@ public abstract class CoreAdminParams {
public static final String GET_RANGES = "getRanges";
- public static final String ROLES = "roles";
-
public static final String REQUESTID = "requestid";
public static final String CORE_NODE_NAME = "coreNodeName";
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
index de63551d4aa..684a2765ce1 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
@@ -1511,7 +1511,6 @@ public abstract class AbstractBasicDistributedZkTestBase
extends AbstractFullDis
try (SolrClient client = getHttpSolrClient(baseUrl)) {
// client.setConnectionTimeout(15000);
Create createCmd = new Create();
- createCmd.setRoles("none");
createCmd.setCoreName(collection + num);
createCmd.setCollection(collection);
