Merge branch '2.1'

apache · Jun 23, 2023 · 260fde4 · 260fde4
2 parents 838e6f4 + 05e4693
commit 260fde4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@ -601,7 +601,7 @@ public interface MetricsProducer {
   Logger LOG = LoggerFactory.getLogger(MetricsProducer.class);
 
   String METRICS_LOW_MEMORY = "accumulo.detected.low.memory";
-  String METRICS_COMPACTOR_PREFIX = "accumulo.compactor";
+  String METRICS_COMPACTOR_PREFIX = "accumulo.compactor.";
   String METRICS_COMPACTOR_MAJC_STUCK = METRICS_COMPACTOR_PREFIX + "majc.stuck";
 
   String METRICS_FATE_PREFIX = "accumulo.fate.";

diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -80,20 +80,6 @@ public TableConfiguration(ServerContext context, TableId tableId, NamespaceConfi
         newDeriver(conf -> createCryptoService(conf, tableId, context.getCryptoFactory()));
   }
 
-  @Override
-  public boolean isPropertySet(Property prop) {
-    if (_isPropertySet(prop)) {
-      return true;
-    }
-
-    return getParent().isPropertySet(prop);
-  }
-
-  private boolean _isPropertySet(Property property) {
-    Map<String,String> propMap = getSnapshot();
-    return propMap.get(property.getKey()) != null;
-  }
-
   @Override
   public String get(Property property) {
     String value = _get(property);

diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooBasedConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooBasedConfiguration.java
@@ -141,15 +141,7 @@ public void getProperties(final Map<String,String> props, final Predicate<String
 
   @Override
   public boolean isPropertySet(final Property property) {
-
-    Map<String,String> theseProps = getSnapshot();
-
-    if (theseProps.get(property.getKey()) != null) {
-      return true;
-    }
-
-    return getParent().isPropertySet(property);
-
+    return getSnapshot().get(property.getKey()) != null || getParent().isPropertySet(property);
   }
 
   public @NonNull Map<String,String> getSnapshot() {