This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 26764417879fddc0c449cca203b8c9848643c97a Merge: 47b90510d8 1ba1803f47 Author: Daniel Roberts ddanielr <[email protected]> AuthorDate: Fri Nov 7 14:13:12 2025 +0000 Merge branch '2.1' core/src/main/java/org/apache/accumulo/core/conf/Property.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index ed35c8683f,d6acb504fa..986e774c49 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -1711,18 -2077,14 +1711,19 @@@ public enum Property || key.startsWith(Property.SSERV_PREFIX.getKey()) || key.startsWith(Property.COMPACTION_COORDINATOR_PREFIX.getKey()) || key.startsWith(Property.MANAGER_PREFIX.getKey()) - || key.startsWith(Property.MASTER_PREFIX.getKey()) || key.startsWith(Property.GC_PREFIX.getKey()) || key.startsWith(Property.GENERAL_ARBITRARY_PROP_PREFIX.getKey()) + || key.equals(Property.COMPACTION_WARN_TIME.getKey()) || key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MIN.getKey()) - || key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MAX.getKey()); + || key.equals(Property.GENERAL_FILE_NAME_ALLOCATION_BATCH_SIZE_MAX.getKey()) - || key.equals(Property.GENERAL_SERVER_ITERATOR_OPTIONS_COMPRESSION_ALGO.getKey()) - || key.startsWith(VFS_CONTEXT_CLASSPATH_PROPERTY.getKey()) - || key.startsWith(REPLICATION_PREFIX.getKey()); ++ || key.equals(Property.GENERAL_SERVER_ITERATOR_OPTIONS_COMPRESSION_ALGO.getKey()); + } + + public static boolean isValidResourceGroupPropertyKey(String property) { + return property.startsWith(Property.GENERAL_PREFIX.getKey()) + || property.startsWith(COMPACTION_PREFIX.getKey()) + || property.startsWith(COMPACTOR_PREFIX.getKey()) + || property.startsWith(SSERV_PREFIX.getKey()) || property.startsWith(TSERV_PREFIX.getKey()); } /**
