Apache Solr open-source search software
SOLR-15019: Remove support for (unsecure) env variables until it's needed.
Andrzej Bialeckid79b19aeda8b
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.javaindex ae2afc7b814..2d9e581b058 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java@@ -32,12 +32,6 @@ public interface AttributeFetcher {*/AttributeFetcher requestNodeSystemProperty(String name);- /**- * Request an environment variable on each node. To get the value use {@link AttributeValues#getEnvironmentVariable(Node, String)}- * @param name environment property name- */- AttributeFetcher requestNodeEnvironmentVariable(String name);-/*** Request a node metric from each node. To get the value use {@link AttributeValues#getNodeMetric(Node, NodeMetric)}* @param metric metric to retrieve (see {@link NodeMetric})diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.java b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.javaindex b0e7e45c56e..a3666cc55cd 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.java@@ -27,11 +27,6 @@ public interface AttributeValues {*/Optional<String> getSystemProperty(Node node, String name);- /**- * For the given node: environment variable value- */- Optional<String> getEnvironmentVariable(Node node, String name);-/*** For the given node: metric identified by an instance of {@link NodeMetric}*/diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.javaindex af8e72e461c..0dcac3b38a9 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java@@ -64,12 +64,6 @@ public class AttributeFetcherImpl implements AttributeFetcher {return this;}- @Override- public AttributeFetcher requestNodeEnvironmentVariable(String name) {- requestedNodeSystemSnitchTags.add(getSystemEnvSnitchTag(name));- return this;- }-@Overridepublic AttributeFetcher requestNodeMetric(NodeMetric<?> metric) {requestedNodeMetricSnitchTags.add(metric);@@ -214,8 +208,4 @@ public class AttributeFetcherImpl implements AttributeFetcher {public static String getSystemPropertySnitchTag(String name) {return ImplicitSnitch.SYSPROP + name;}-- public static String getSystemEnvSnitchTag(String name) {- return ImplicitSnitch.SYSENV + name;- }}diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.javaindex 873bd3d867c..5861b87fdac 100644--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.java+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.java@@ -53,15 +53,6 @@ public class AttributeValuesImpl implements AttributeValues {return Optional.ofNullable(nodeToValue.get(node));}- @Override- public Optional<String> getEnvironmentVariable(Node node, String name) {- Map<Node, String> nodeToValue = systemSnitchToNodeToValue.get(AttributeFetcherImpl.getSystemEnvSnitchTag(name));- if (nodeToValue == null) {- return Optional.empty();- }- return Optional.ofNullable(nodeToValue.get(node));- }-@Override@SuppressWarnings("unchecked")public <T> Optional<T> getNodeMetric(Node node, NodeMetric<T> metric) {diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/AttributeFetcherForTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/AttributeFetcherForTest.javaindex bcc300ba108..8553ee0c967 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/AttributeFetcherForTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/AttributeFetcherForTest.java@@ -35,11 +35,6 @@ public class AttributeFetcherForTest implements AttributeFetcher {return this;}- @Override- public AttributeFetcher requestNodeEnvironmentVariable(String name) {- throw new UnsupportedOperationException("Not yet implemented...");- }-@Overridepublic AttributeFetcher requestNodeMetric(NodeMetric<?> metric) {return this;diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.javaindex f2140e74a20..93003a1316d 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java@@ -360,18 +360,6 @@ public class PlacementPluginIntegrationTest extends SolrCloudTestCase {AttributeFetcher attributeFetcher = new AttributeFetcherImpl(cloudManager);NodeMetric<String> someMetricKey = new NodeMetricImpl<>("solr.jvm:system.properties:user.name");String sysprop = "user.name";- Set<String> potentialEnvVars = Set.of("PWD", "TMPDIR", "TMP", "TEMP", "USER", "USERNAME", "HOME");-- String envVar = null;- for (String env : potentialEnvVars) {- if (System.getenv(env) != null) {- envVar = env;- break;- }- }- if (envVar == null) {- fail("None of the potential env vars exist? " + potentialEnvVars);- }attributeFetcher.fetchFrom(cluster.getLiveNodes()).requestNodeMetric(NodeMetricImpl.HEAP_USAGE)@@ -382,11 +370,9 @@ public class PlacementPluginIntegrationTest extends SolrCloudTestCase {.requestNodeMetric(NodeMetricImpl.AVAILABLE_PROCESSORS).requestNodeMetric(someMetricKey).requestNodeSystemProperty(sysprop)- .requestNodeEnvironmentVariable(envVar).requestCollectionMetrics(collection, Set.of(ReplicaMetricImpl.INDEX_SIZE_GB, ReplicaMetricImpl.QUERY_RATE_1MIN, ReplicaMetricImpl.UPDATE_RATE_1MIN));AttributeValues attributeValues = attributeFetcher.fetchAttributes();String userName = System.getProperty("user.name");- String envVarValue = System.getenv(envVar);// node metricsfor (Node node : cluster.getLiveNodes()) {Optional<Double> doubleOpt = attributeValues.getNodeMetric(node, NodeMetricImpl.HEAP_USAGE);@@ -409,9 +395,6 @@ public class PlacementPluginIntegrationTest extends SolrCloudTestCase {Optional<String> syspropOpt = attributeValues.getSystemProperty(node, sysprop);assertTrue("sysprop", syspropOpt.isPresent());assertEquals("user.name sysprop", userName, syspropOpt.get());- Optional<String> envVarOpt = attributeValues.getEnvironmentVariable(node, envVar);- assertTrue("envVar", envVarOpt.isPresent());- assertEquals("envVar " + envVar, envVarValue, envVarOpt.get());}assertTrue(attributeValues.getCollectionMetrics(COLLECTION).isPresent());CollectionMetrics collectionMetrics = attributeValues.getCollectionMetrics(COLLECTION).get();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.javaindex ccc6583d28d..a6ae53e117c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java@@ -209,9 +209,6 @@ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriterif (tag.startsWith(SYSPROP)) {metricsKeyVsTag.computeIfAbsent("solr.jvm:system.properties:" + tag.substring(SYSPROP.length()), k -> new HashSet<>()).add(tag);- } else if (tag.startsWith(SYSENV)) {- metricsKeyVsTag.computeIfAbsent("solr.jvm:system.env:" + tag.substring(SYSENV.length()), k -> new HashSet<>())- .add(tag);} else if (tag.startsWith(METRICS_PREFIX)) {metricsKeyVsTag.computeIfAbsent(tag.substring(METRICS_PREFIX.length()), k -> new HashSet<>()).add(tag);diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/rule/ImplicitSnitch.java b/solr/solrj/src/java/org/apache/solr/common/cloud/rule/ImplicitSnitch.javaindex acc412f22bd..afada51c6d6 100644--- a/solr/solrj/src/java/org/apache/solr/common/cloud/rule/ImplicitSnitch.java+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/rule/ImplicitSnitch.java@@ -49,7 +49,6 @@ public class ImplicitSnitch extends Snitch {public static final String ROLE = "role";public static final String NODEROLE = "nodeRole";public static final String SYSPROP = "sysprop.";- public static final String SYSENV = "sysenv.";public static final String SYSLOADAVG = "sysLoadAvg";public static final String HEAPUSAGE = "heapUsage";public static final List<String> IP_SNITCHES = Collections.unmodifiableList(Arrays.asList("ip_1", "ip_2", "ip_3", "ip_4"));