This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new 626083ded2 Removed code expecting compaction service rate limits
(#4799)
626083ded2 is described below
commit 626083ded27911d1cf337810c17028b31e3c988c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Aug 12 13:13:22 2024 -0400
Removed code expecting compaction service rate limits (#4799)
Compaction related rate limiting properties were removed in #3874
---
.../util/compaction/CompactionServicesConfig.java | 25 +++++-----------------
.../compaction/CompactionServicesConfigTest.java | 5 +----
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfig.java
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfig.java
index 3fa3ca8682..11f54e87b6 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfig.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfig.java
@@ -21,11 +21,9 @@ package org.apache.accumulo.core.util.compaction;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.function.Predicate;
import org.apache.accumulo.core.client.PluginEnvironment;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
import org.apache.accumulo.core.conf.Property;
import com.google.common.collect.Sets;
@@ -38,7 +36,6 @@ public class CompactionServicesConfig {
private final Map<String,String> planners = new HashMap<>();
private final Map<String,String> plannerPrefixes = new HashMap<>();
- private final Map<String,Long> rateLimits = new HashMap<>();
private final Map<String,Map<String,String>> options = new HashMap<>();
private static final Property prefix = Property.COMPACTION_SERVICE_PREFIX;
@@ -57,21 +54,19 @@ public class CompactionServicesConfig {
}
public CompactionServicesConfig(PluginEnvironment.Configuration conf) {
- // TODO will probably not need rate limit eventually and the 2nd param
predicate can go away
this(getConfiguration(prefix -> {
var props = conf.getWithPrefix(prefix.getKey());
Map<String,String> stripped = new HashMap<>();
props.forEach((k, v) ->
stripped.put(k.substring(prefix.getKey().length()), v));
return stripped;
- }), property -> conf.isSet(property.getKey()));
+ }));
}
public CompactionServicesConfig(AccumuloConfiguration aconf) {
- this(getConfiguration(aconf::getAllPropertiesWithPrefixStripped),
aconf::isPropertySet);
+ this(getConfiguration(aconf::getAllPropertiesWithPrefixStripped));
}
- private CompactionServicesConfig(Map<String,Map<String,String>> configs,
- Predicate<Property> isSetPredicate) {
+ private CompactionServicesConfig(Map<String,Map<String,String>> configs) {
configs.forEach((prefix, props) -> {
props.forEach((prop, val) -> {
String[] tokens = prop.split("\\.");
@@ -80,11 +75,6 @@ public class CompactionServicesConfig {
planners.put(tokens[0], val);
} else if (tokens.length == 4 && tokens[1].equals("planner") &&
tokens[2].equals("opts")) {
options.computeIfAbsent(tokens[0], k -> new
HashMap<>()).put(tokens[3], val);
- } else if (tokens.length == 3 && tokens[1].equals("rate") &&
tokens[2].equals("limit")) {
- var eprop = Property.getPropertyByKey(prop);
- if (eprop == null || isSetPredicate.test(eprop)) {
- rateLimits.put(tokens[0],
ConfigurationTypeHelper.getFixedMemoryAsBytes(val));
- }
} else {
throw new IllegalArgumentException(
"Malformed compaction service property " + prefix + prop);
@@ -103,8 +93,7 @@ public class CompactionServicesConfig {
public boolean equals(Object o) {
if (o instanceof CompactionServicesConfig) {
var oc = (CompactionServicesConfig) o;
- return getPlanners().equals(oc.getPlanners()) &&
getOptions().equals(oc.getOptions())
- && getRateLimits().equals(oc.getRateLimits());
+ return getPlanners().equals(oc.getPlanners()) &&
getOptions().equals(oc.getOptions());
}
return false;
@@ -112,7 +101,7 @@ public class CompactionServicesConfig {
@Override
public int hashCode() {
- return Objects.hash(getPlanners(), getOptions(), getRateLimits());
+ return Objects.hash(getPlanners(), getOptions());
}
public Map<String,String> getPlanners() {
@@ -123,10 +112,6 @@ public class CompactionServicesConfig {
return plannerPrefixes.get(service);
}
- public Map<String,Long> getRateLimits() {
- return rateLimits;
- }
-
public Map<String,Map<String,String>> getOptions() {
return options;
}
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfigTest.java
b/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfigTest.java
index 0a7a4dc049..c6a6c9bcb0 100644
---
a/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfigTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionServicesConfigTest.java
@@ -53,11 +53,8 @@ public class CompactionServicesConfigTest {
@Test
public void testCompactionRateLimits() {
ConfigurationCopy conf = new ConfigurationCopy();
- CompactionServicesConfig compactionConfig;
conf.set(prefix.getKey() + "cs1.planner",
RatioBasedCompactionPlanner.class.getName());
- conf.set(prefix.getKey() + "cs1.rate.limit", "2M");
- compactionConfig = new CompactionServicesConfig(conf);
- assertEquals(2097152, compactionConfig.getRateLimits().get("cs1"));
+ new CompactionServicesConfig(conf);
}
}
