(accumulo) 01/01: Merge branch '2.1'

[ddanielr]

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 ddfe854345af0a8fc0f095417475a8b2d2843f39
Merge: eaac020323 80275cd198
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Wed May 21 18:06:46 2025 +0000

    Merge branch '2.1'

 .../apache/accumulo/server/conf/ServerConfigurationFactory.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
index 60c16af044,5ccc3b9335..7b8279ae3f
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
@@@ -78,15 -77,18 +78,18 @@@ public class ServerConfigurationFactor
    public ServerConfigurationFactory(ServerContext context, SiteConfiguration 
siteConfig) {
      this.context = context;
      this.siteConfig = siteConfig;
-     this.systemConfig =
-         memoize(() -> new SystemConfiguration(context, SystemPropKey.of(), 
siteConfig));
+     this.systemConfig = memoize(() -> {
 -      var sysConf =
 -          new SystemConfiguration(context, 
SystemPropKey.of(context.getInstanceID()), siteConfig);
++      var sysConf = new SystemConfiguration(context, SystemPropKey.of(), 
siteConfig);
+       ConfigCheckUtil.validate(sysConf, "system config");
+       return sysConf;
+     });
      tableParentConfigs =
 -        Caffeine.newBuilder().expireAfterAccess(CACHE_EXPIRATION_HRS, 
TimeUnit.HOURS).build();
 -    tableConfigs =
 -        Caffeine.newBuilder().expireAfterAccess(CACHE_EXPIRATION_HRS, 
TimeUnit.HOURS).build();
 -    namespaceConfigs =
 -        Caffeine.newBuilder().expireAfterAccess(CACHE_EXPIRATION_HRS, 
TimeUnit.HOURS).build();
 +        Caches.getInstance().createNewBuilder(CacheName.TABLE_PARENT_CONFIGS, 
false)
 +            .expireAfterAccess(CACHE_EXPIRATION_HRS, TimeUnit.HOURS).build();
 +    tableConfigs = 
Caches.getInstance().createNewBuilder(CacheName.TABLE_CONFIGS, false)
 +        .expireAfterAccess(CACHE_EXPIRATION_HRS, TimeUnit.HOURS).build();
 +    namespaceConfigs = 
Caches.getInstance().createNewBuilder(CacheName.NAMESPACE_CONFIGS, false)
 +        .expireAfterAccess(CACHE_EXPIRATION_HRS, TimeUnit.HOURS).build();
  
      refresher = new ConfigRefreshRunner();
      Runtime.getRuntime()