(accumulo) 02/03: Merge branch 'main' into elasticity

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 9990e2bb75e273a16175393915c7957467b1defd
Merge: cbb9efdece 62cd737399
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Jul 24 10:02:35 2024 -0400

    Merge branch 'main' into elasticity

 .../security/tokens/CredentialProviderToken.java   |  26 ++++++++-
 .../core/client/security/tokens/PasswordToken.java |   1 +
 .../accumulo/core/conf/AccumuloConfiguration.java  |   4 +-
 .../org/apache/accumulo/core/conf/Property.java    |   6 +-
 .../org/apache/accumulo/core/util/CreateToken.java |   2 +-
 .../tokens/CredentialProviderTokenTest.java        |  65 ++++++++++++++++-----
 core/src/test/resources/passwords.jceks            | Bin 963 -> 967 bytes
 .../server/conf/RuntimeFixedProperties.java        |  13 +++++
 .../accumulo/server/conf/SystemConfiguration.java  |   5 +-
 .../AccumuloConfigurationIsPropertySetTest.java    |  28 +++++++--
 .../server/conf/SystemConfigurationTest.java       |   5 +-
 .../org/apache/accumulo/tserver/ScanServer.java    |   2 +-
 .../accumulo/test/ScanServerMetadataEntriesIT.java |   2 +-
 13 files changed, 130 insertions(+), 29 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
index 5d958a6ee8,da0e141732..e620b5ba50
--- 
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
@@@ -78,9 -78,9 +78,9 @@@ public class ScanServerMetadataEntriesI
      @Override
      public void configureMiniCluster(MiniAccumuloConfigImpl cfg,
          org.apache.hadoop.conf.Configuration coreSite) {
 -      cfg.setNumScanServers(1);
 +      cfg.getClusterServerConfiguration().setNumDefaultScanServers(1);
        cfg.setProperty(Property.TSERV_SESSION_MAXIDLE, "3s");
-       cfg.setProperty(Property.SSERVER_SCAN_REFERENCE_EXPIRATION_TIME, "5s");
+       cfg.setProperty(Property.SSERV_SCAN_REFERENCE_EXPIRATION_TIME, "5s");
      }
    }