This is an automated email from the ASF dual-hosted git repository.
krathbun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 2a5616162aab8463636f1fd66102bcdb10040fb2
Merge: 4ce7511748 ed40b62851
Author: Kevin Rathbun <kevinrr...@gmail.com>
AuthorDate: Mon Jun 30 15:30:43 2025 -0400
Merge branch '2.1'
.../org/apache/accumulo/core/conf/Property.java | 83 ++++++++++++++++------
.../apache/accumulo/core/conf/PropertyTest.java | 2 +-
.../server/conf/RuntimeFixedProperties.java | 4 +-
.../accumulo/server/util/SystemPropUtil.java | 22 +++++-
.../AccumuloConfigurationIsPropertySetTest.java | 2 +-
.../server/conf/RuntimeFixedPropertiesTest.java | 2 +-
.../accumulo/shell/commands/ConfigCommand.java | 24 +++++--
7 files changed, 101 insertions(+), 38 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 976c79dd82,7a761c825e..061210627a
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -1534,35 -1934,77 +1536,70 @@@ public enum Property
// these properties are fixed to a specific value at startup and require a
restart for changes to
// take effect; these are always system-level properties, and not namespace
or table properties
- public static final EnumSet<Property> fixedProperties = EnumSet.of(
- // port options
- GC_PORT, MANAGER_CLIENTPORT, TSERV_CLIENTPORT, SSERV_CLIENTPORT,
SSERV_PORTSEARCH,
- COMPACTOR_PORTSEARCH, TSERV_PORTSEARCH,
+ public static final Set<Property> FIXED_PROPERTIES =
Collections.unmodifiableSet(EnumSet.of(
+ // RPC options
+ RPC_BACKLOG, RPC_SSL_KEYSTORE_TYPE, RPC_SSL_TRUSTSTORE_TYPE,
RPC_USE_JSSE,
+ RPC_SSL_ENABLED_PROTOCOLS, RPC_SSL_CLIENT_PROTOCOL, RPC_SASL_QOP,
RPC_MAX_MESSAGE_SIZE,
- // max message options
- RPC_MAX_MESSAGE_SIZE,
+ // INSTANCE options
+ INSTANCE_ZK_HOST, INSTANCE_ZK_TIMEOUT, INSTANCE_SECRET,
INSTANCE_SECURITY_AUTHENTICATOR,
+ INSTANCE_SECURITY_AUTHORIZOR, INSTANCE_SECURITY_PERMISSION_HANDLER,
INSTANCE_RPC_SSL_ENABLED,
+ INSTANCE_RPC_SSL_CLIENT_AUTH, INSTANCE_RPC_SASL_ENABLED,
INSTANCE_CRYPTO_FACTORY,
- // compaction coordiantor properties
- MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE,
+ // GENERAL options
+ GENERAL_KERBEROS_RENEWAL_PERIOD, GENERAL_OPENTELEMETRY_ENABLED,
GENERAL_VOLUME_CHOOSER,
+ GENERAL_DELEGATION_TOKEN_LIFETIME,
GENERAL_DELEGATION_TOKEN_UPDATE_INTERVAL,
+ GENERAL_IDLE_PROCESS_INTERVAL, GENERAL_MICROMETER_ENABLED,
+ GENERAL_MICROMETER_JVM_METRICS_ENABLED, GENERAL_MICROMETER_LOG_METRICS,
+ GENERAL_MICROMETER_FACTORY, GENERAL_SERVER_LOCK_VERIFICATION_INTERVAL,
- GENERAL_MAX_MESSAGE_SIZE, GENERAL_CACHE_MANAGER_IMPL,
++ GENERAL_CACHE_MANAGER_IMPL, GENERAL_MICROMETER_CACHE_METRICS_ENABLED,
++ GENERAL_LOW_MEM_DETECTOR_INTERVAL,
- // block cache options
- GENERAL_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
- TSERV_SUMMARYCACHE_SIZE, SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE,
SSERV_SUMMARYCACHE_SIZE,
+ // MANAGER options
+ MANAGER_TABLET_BALANCER, MANAGER_THREADCHECK,
MANAGER_FATE_METRICS_MIN_UPDATE_INTERVAL,
- MANAGER_REPLICATION_SCAN_INTERVAL, MANAGER_REPLICATION_COORDINATOR_PORT,
- MANAGER_REPLICATION_COORDINATOR_MINTHREADS,
MANAGER_REPLICATION_COORDINATOR_THREADCHECK,
+ MANAGER_METADATA_SUSPENDABLE, MANAGER_STARTUP_TSERVER_AVAIL_MIN_COUNT,
+ MANAGER_STARTUP_TSERVER_AVAIL_MAX_WAIT, MANAGER_CLIENTPORT,
MANAGER_MINTHREADS,
+ MANAGER_MINTHREADS_TIMEOUT, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME,
++ MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE,
MANAGER_TABLET_REFRESH_MINTHREADS,
++ MANAGER_TABLET_REFRESH_MAXTHREADS, MANAGER_TABLET_MERGEABILITY_INTERVAL,
++ MANAGER_FATE_CONDITIONAL_WRITER_THREADS_MAX,
- // blocksize options
- TSERV_DEFAULT_BLOCKSIZE, SSERV_DEFAULT_BLOCKSIZE,
+ // SSERV options
+ SSERV_CACHED_TABLET_METADATA_REFRESH_PERCENT, SSERV_THREADCHECK,
SSERV_CLIENTPORT,
+ SSERV_PORTSEARCH, SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE,
SSERV_SUMMARYCACHE_SIZE,
+ SSERV_DEFAULT_BLOCKSIZE, SSERV_SCAN_REFERENCE_EXPIRATION_TIME,
+ SSERV_CACHED_TABLET_METADATA_EXPIRATION, SSERV_MINTHREADS,
SSERV_MINTHREADS_TIMEOUT,
++ SSERV_WAL_SORT_MAX_CONCURRENT, SSERV_GROUP_NAME,
- // sserver specific options
- SSERV_SCAN_REFERENCE_EXPIRATION_TIME,
SSERV_CACHED_TABLET_METADATA_EXPIRATION,
+ // TSERV options
- TSERV_TOTAL_MUTATION_QUEUE_MAX, TSERV_WAL_MAX_SIZE,
TSERV_WALOG_MAX_SIZE, TSERV_WAL_MAX_AGE,
- TSERV_WALOG_MAX_AGE, TSERV_WAL_TOLERATED_CREATION_FAILURES,
- TSERV_WALOG_TOLERATED_CREATION_FAILURES,
TSERV_WAL_TOLERATED_WAIT_INCREMENT,
- TSERV_WALOG_TOLERATED_WAIT_INCREMENT,
TSERV_WAL_TOLERATED_MAXIMUM_WAIT_DURATION,
- TSERV_WALOG_TOLERATED_MAXIMUM_WAIT_DURATION, TSERV_MAX_IDLE,
TSERV_SESSION_MAXIDLE,
- TSERV_SCAN_RESULTS_MAX_TIMEOUT, TSERV_MAJC_DELAY,
TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN,
- TSERV_MAJC_THREAD_MAXOPEN, TSERV_MAJC_MAXCONCURRENT,
TSERV_MAJC_THROUGHPUT,
- TSERV_MINC_MAXCONCURRENT, TSERV_MONITOR_FS, TSERV_HEALTH_CHECK_FREQ,
TSERV_THREADCHECK,
++ TSERV_TOTAL_MUTATION_QUEUE_MAX, TSERV_WAL_MAX_SIZE, TSERV_WAL_MAX_AGE,
++ TSERV_WAL_TOLERATED_CREATION_FAILURES,
TSERV_WAL_TOLERATED_WAIT_INCREMENT,
++ TSERV_WAL_TOLERATED_MAXIMUM_WAIT_DURATION, TSERV_MAX_IDLE,
TSERV_SESSION_MAXIDLE,
++ TSERV_SCAN_RESULTS_MAX_TIMEOUT, TSERV_MINC_MAXCONCURRENT,
TSERV_THREADCHECK,
+ TSERV_LOG_BUSY_TABLETS_COUNT, TSERV_LOG_BUSY_TABLETS_INTERVAL,
TSERV_WAL_SORT_MAX_CONCURRENT,
- TSERV_RECOVERY_MAX_CONCURRENT, TSERV_WORKQ_THREADS,
TSERV_SLOW_FILEPERMIT_MILLIS,
- TSERV_READ_AHEAD_MAXCONCURRENT,
TSERV_METADATA_READ_AHEAD_MAXCONCURRENT, TSERV_WAL_BLOCKSIZE,
- TSERV_CLIENTPORT, TSERV_PORTSEARCH, TSERV_MAX_MESSAGE_SIZE,
TSERV_CACHE_MANAGER_IMPL,
++ TSERV_SLOW_FILEPERMIT_MILLIS, TSERV_WAL_BLOCKSIZE, TSERV_CLIENTPORT,
TSERV_PORTSEARCH,
+ TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE, TSERV_SUMMARYCACHE_SIZE,
TSERV_DEFAULT_BLOCKSIZE,
+ TSERV_MINTHREADS, TSERV_MINTHREADS_TIMEOUT, TSERV_NATIVEMAP_ENABLED,
TSERV_MAXMEM,
- TSERV_SCAN_MAX_OPENFILES,
++ TSERV_SCAN_MAX_OPENFILES, TSERV_ONDEMAND_UNLOADER_INTERVAL,
TSERV_GROUP_NAME,
- // thread options
- TSERV_MINTHREADS, TSERV_MINTHREADS_TIMEOUT, SSERV_MINTHREADS,
SSERV_MINTHREADS_TIMEOUT,
- MANAGER_MINTHREADS, MANAGER_MINTHREADS_TIMEOUT, COMPACTOR_MINTHREADS,
- COMPACTOR_MINTHREADS_TIMEOUT,
+ // GC options
+ GC_CANDIDATE_BATCH_SIZE, GC_CYCLE_START, GC_PORT,
- // others
- TSERV_NATIVEMAP_ENABLED, TSERV_MAXMEM, TSERV_SCAN_MAX_OPENFILES,
- MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME);
+ // MONITOR options
+ MONITOR_PORT, MONITOR_SSL_KEYSTORETYPE, MONITOR_SSL_TRUSTSTORETYPE,
+ MONITOR_SSL_INCLUDE_PROTOCOLS, MONITOR_LOCK_CHECK_INTERVAL,
+
- // REPLICATION options
- REPLICATION_RECEIPT_SERVICE_PORT, REPLICATION_MIN_THREADS,
REPLICATION_THREADCHECK,
- REPLICATION_DRIVER_DELAY, REPLICATION_WORK_PROCESSOR_DELAY,
REPLICATION_WORK_PROCESSOR_PERIOD,
-
+ // COMPACTOR options
+ COMPACTOR_CANCEL_CHECK_INTERVAL, COMPACTOR_CLIENTPORT,
COMPACTOR_THREADCHECK,
+ COMPACTOR_PORTSEARCH, COMPACTOR_MINTHREADS,
COMPACTOR_MINTHREADS_TIMEOUT,
++ COMPACTOR_GROUP_NAME,
+
+ // COMPACTION_COORDINATOR options
- COMPACTION_COORDINATOR_THRIFTCLIENT_PORTSEARCH,
COMPACTION_COORDINATOR_CLIENTPORT,
- COMPACTION_COORDINATOR_THREADCHECK,
COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL,
- COMPACTION_COORDINATOR_FINALIZER_COMPLETION_CHECK_INTERVAL,
COMPACTION_COORDINATOR_MINTHREADS,
- COMPACTION_COORDINATOR_MINTHREADS_TIMEOUT,
- COMPACTION_COORDINATOR_FINALIZER_TSERVER_NOTIFIER_MAXTHREADS,
- COMPACTION_COORDINATOR_SUMMARIES_MAXTHREADS,
COMPACTION_COORDINATOR_FINALIZER_QUEUE_SIZE));
++ COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL,
++
++ // COMPACTION_SERVICE options
++ COMPACTION_SERVICE_DEFAULT_PLANNER, COMPACTION_SERVICE_DEFAULT_MAX_OPEN,
++ COMPACTION_SERVICE_DEFAULT_GROUPS));
/**
* Checks if the given property may be changed via Zookeeper, but not
recognized until the restart
diff --cc
server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
index 8ef760b772,6a7bf345ce..977beb7297
---
a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
@@@ -63,8 -63,9 +63,9 @@@ public class SystemPropUtil
removePropWithoutDeprecationWarning(context, resolved);
}
- private static void removePropWithoutDeprecationWarning(ServerContext
context, String property) {
+ public static void removePropWithoutDeprecationWarning(ServerContext
context, String property) {
+ logIfFixed(property, null);
- context.getPropStore().removeProperties(SystemPropKey.of(context),
List.of(property));
+ context.getPropStore().removeProperties(SystemPropKey.of(),
List.of(property));
}
private static String validateSystemProperty(ServerContext context,
SystemPropKey key,
