From 838cd3d450f034eaa71c22bbf6922643e8185213 Mon Sep 17 00:00:00 2001
From: Daniel Roberts <ddanielr@gmail.com>
Date: Fri, 23 Jun 2023 15:38:41 -0400
Subject: [PATCH 1/2] Fix the compactor prefix format (#3535)

---
 .../java/org/apache/accumulo/core/metrics/MetricsProducer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 876da0635cb..6d468812bdf 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@ -602,7 +602,7 @@ public interface MetricsProducer {
 
   Logger LOG = LoggerFactory.getLogger(MetricsProducer.class);
 
-  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.";

From 05e4693ef6dd868237ad1e16ec3107f48ee89067 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Fri, 23 Jun 2023 17:12:40 -0400
Subject: [PATCH 2/2] Simplify isPropertySet and remove redundant code (#3530)

* Simplify ZooBasedConfiguration's implementation of isPropertySet, and
* Remove TableConfiguration's redundant implementation, as it's the same
  as its super class (it just didn't look the same until it was
  simplified)
---
 .../accumulo/server/conf/TableConfiguration.java   | 14 --------------
 .../server/conf/ZooBasedConfiguration.java         | 10 +---------
 2 files changed, 1 insertion(+), 23 deletions(-)

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
index 1321902bc0c..b793719cb2e 100644
--- 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
index 15126c806a0..24cbe7260ce 100644
--- 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() {