This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 7701e59022 Add Mergeability column to support automatic merges (#5187)
add be22deed47 Clean up ZooKeeper tooling (#5192)
new e745a5dcd4 Merge branch '3.1'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/core/clientImpl/ClientContext.java | 85 +++---
.../accumulo/core/clientImpl/ClientInfo.java | 22 +-
.../accumulo/core/clientImpl/ClientInfoImpl.java | 61 ++--
.../core/clientImpl/InstanceOperationsImpl.java | 18 --
.../core/clientImpl/ZookeeperLockChecker.java | 23 +-
.../org/apache/accumulo/core/fate/AdminUtil.java | 45 +--
.../core/fate/zookeeper/MetaFateStore.java | 27 +-
.../accumulo/core/fate/zookeeper/ZooCache.java | 63 ++---
.../core/fate/zookeeper/ZooCacheFactory.java | 128 ---------
.../accumulo/core/fate/zookeeper/ZooReader.java | 38 +--
.../core/fate/zookeeper/ZooReaderWriter.java | 39 +--
.../accumulo/core/fate/zookeeper/ZooSession.java | 252 -----------------
.../accumulo/core/fate/zookeeper/ZooUtil.java | 103 +++++--
.../org/apache/accumulo/core/lock/ServiceLock.java | 12 +-
.../core/metadata/schema/RootTabletMetadata.java | 2 +-
.../org/apache/accumulo/core/util/MonitorUtil.java | 2 +-
.../apache/accumulo/core/zookeeper/ZooSession.java | 312 +++++++++++++++++++++
.../core/clientImpl/ZookeeperLockCheckerTest.java | 4 +-
.../core/fate/zookeeper/ZooCacheFactoryTest.java | 83 ------
.../accumulo/core/fate/zookeeper/ZooCacheTest.java | 27 +-
.../core/fate/zookeeper/ZooReaderWriterTest.java | 39 +--
.../core/fate/zookeeper/ZooSessionTest.java | 43 ---
.../accumulo/core/fate/zookeeper/ZooUtilTest.java | 39 +++
.../accumulo/core/zookeeper/ZooSessionTest.java | 62 ++++
.../standalone/StandaloneAccumuloCluster.java | 22 +-
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 29 +-
.../org/apache/accumulo/server/ServerContext.java | 42 ++-
.../org/apache/accumulo/server/ServerInfo.java | 209 ++++++++------
.../apache/accumulo/server/cli/ServerUtilOpts.java | 10 +-
.../server/compaction/CompactionConfigStorage.java | 10 +-
.../server/conf/store/impl/ZooPropLoader.java | 5 +-
.../server/conf/store/impl/ZooPropStore.java | 25 +-
.../accumulo/server/conf/util/ZooInfoViewer.java | 88 +++---
.../accumulo/server/conf/util/ZooPropEditor.java | 9 +-
.../accumulo/server/conf/util/ZooPropUtils.java | 84 ------
.../apache/accumulo/server/init/Initialize.java | 6 +-
.../accumulo/server/init/ZooKeeperInitializer.java | 2 +-
.../accumulo/server/log/WalStateManager.java | 2 +-
.../accumulo/server/manager/LiveTServerSet.java | 23 +-
.../server/manager/state/DeadServerList.java | 9 +-
.../server/metadata/RootConditionalWriter.java | 2 +-
.../server/metadata/RootTabletMutatorImpl.java | 2 +-
.../accumulo/server/metadata/ServerAmpleImpl.java | 4 +-
.../server/security/SecurityOperation.java | 6 +-
.../ZooAuthenticationKeyDistributor.java | 29 +-
.../delegation/ZooAuthenticationKeyWatcher.java | 5 +-
.../security/handler/KerberosAuthenticator.java | 6 +-
.../server/security/handler/ZKAuthenticator.java | 13 +-
.../server/security/handler/ZKAuthorizor.java | 11 +-
.../server/security/handler/ZKPermHandler.java | 4 +-
.../accumulo/server/tables/TableManager.java | 14 +-
.../server/tablets/UniqueNameAllocator.java | 9 +-
.../org/apache/accumulo/server/util/Admin.java | 5 +-
.../apache/accumulo/server/util/ChangeSecret.java | 113 +++++---
.../accumulo/server/util/DeleteZooInstance.java | 42 +--
.../apache/accumulo/server/util/DumpZookeeper.java | 30 +-
.../apache/accumulo/server/util/ListInstances.java | 56 ++--
.../accumulo/server/util/RestoreZookeeper.java | 28 +-
.../accumulo/server/util/ServiceStatusCmd.java | 29 +-
.../accumulo/server/util/TabletServerLocks.java | 2 +-
.../org/apache/accumulo/server/util/ZooZap.java | 16 +-
.../util/checkCommand/RootMetadataCheckRunner.java | 4 +-
.../util/checkCommand/TableLocksCheckRunner.java | 6 +-
.../server/zookeeper/DistributedWorkQueue.java | 2 +-
.../apache/accumulo/server/MockServerContext.java | 16 +-
.../AccumuloConfigurationIsPropertySetTest.java | 2 +-
.../server/conf/NamespaceConfigurationTest.java | 5 +-
.../server/conf/SystemConfigurationTest.java | 14 +-
.../server/conf/store/impl/PropStoreEventTest.java | 32 ++-
.../server/conf/store/impl/ZooPropLoaderTest.java | 34 +--
.../server/conf/store/impl/ZooPropStoreTest.java | 45 +--
.../server/conf/util/ZooInfoViewerTest.java | 77 +++--
.../server/conf/util/ZooPropUtilsTest.java | 68 -----
.../accumulo/server/init/InitializeTest.java | 38 +--
.../accumulo/server/rpc/TServerUtilsTest.java | 8 +-
.../ZooAuthenticationKeyDistributorTest.java | 88 +++---
.../ZooAuthenticationKeyWatcherTest.java | 73 ++---
.../security/handler/ZKAuthenticatorTest.java | 16 +-
.../accumulo/server/util/ServiceStatusCmdTest.java | 200 ++++++-------
.../org/apache/accumulo/compactor/Compactor.java | 13 +-
.../main/java/org/apache/accumulo/gc/GCRun.java | 2 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../java/org/apache/accumulo/manager/Manager.java | 16 +-
.../manager/ManagerClientServiceHandler.java | 2 +-
.../org/apache/accumulo/manager/ManagerTime.java | 2 +-
.../coordinator/CompactionCoordinator.java | 2 +-
.../metrics/fate/meta/MetaFateMetricValues.java | 2 +-
.../manager/metrics/fate/meta/MetaFateMetrics.java | 2 +-
.../accumulo/manager/recovery/RecoveryManager.java | 2 +-
.../accumulo/manager/state/SetGoalState.java | 2 +-
.../apache/accumulo/manager/tableOps/Utils.java | 19 +-
.../manager/tableOps/compact/CompactionDriver.java | 2 +-
.../manager/tableOps/delete/PreDeleteTable.java | 2 +-
.../create/PopulateZookeeperWithNamespace.java | 2 +-
.../tableOps/namespace/rename/RenameNamespace.java | 2 +-
.../manager/tableOps/rename/RenameTable.java | 2 +-
.../manager/tserverOps/ShutdownTServer.java | 2 +-
.../manager/upgrade/PreUpgradeValidation.java | 8 +-
.../manager/upgrade/UpgradeCoordinator.java | 4 +-
.../accumulo/manager/upgrade/Upgrader10to11.java | 2 +-
.../accumulo/manager/upgrade/Upgrader11to12.java | 11 +-
.../accumulo/manager/upgrade/Upgrader12to13.java | 8 +-
.../tableOps/compact/CompactionDriverTest.java | 117 +++-----
.../manager/upgrade/Upgrader10to11Test.java | 71 +++--
.../manager/upgrade/Upgrader11to12Test.java | 22 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 8 +-
.../org/apache/accumulo/tserver/ScanServer.java | 6 +-
.../org/apache/accumulo/tserver/TabletServer.java | 11 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 2 +-
.../test/compaction/ExternalCompaction_1_IT.java | 9 +-
.../accumulo/test/conf/PropStoreConfigIT.java | 2 +-
.../test/conf/store/PropCacheCaffeineImplZkIT.java | 45 +--
.../test/conf/store/PropStoreZooKeeperIT.java | 55 ++--
.../accumulo/test/conf/store/ZooBasedConfigIT.java | 37 ++-
.../accumulo/test/fate/FateOpsCommandsIT.java | 2 +-
.../apache/accumulo/test/fate/FateStoreUtil.java | 13 +-
.../apache/accumulo/test/fate/meta/MetaFateIT.java | 16 +-
.../test/fate/meta/MetaFateInterleavingIT.java | 5 +-
.../test/fate/meta/MetaFateOpsCommandsIT.java | 3 +-
.../fate/meta/MetaFateStatusEnforcementIT.java | 3 +-
.../test/fate/meta/MetaFateStoreFateIT.java | 14 +-
.../test/fate/meta/MetaMultipleStoresIT.java | 4 +-
.../accumulo/test/fate/meta/ZooMutatorIT.java | 8 +-
.../accumulo/test/functional/BackupManagerIT.java | 4 +-
.../accumulo/test/functional/CacheTestClean.java | 18 +-
.../accumulo/test/functional/CacheTestReader.java | 63 +++--
.../accumulo/test/functional/CacheTestWriter.java | 178 ++++++------
.../test/functional/FateConcurrencyIT.java | 14 +-
.../test/functional/FunctionalTestUtils.java | 3 +-
.../test/functional/GarbageCollectorIT.java | 4 +-
.../test/functional/HalfDeadServerWatcherIT.java | 4 +-
.../accumulo/test/functional/ManagerApiIT.java | 171 +++--------
.../test/functional/WatchTheWatchCountIT.java | 4 +-
.../accumulo/test/functional/ZombieTServer.java | 4 +-
.../apache/accumulo/test/lock/ServiceLockIT.java | 88 +++---
.../accumulo/test/performance/NullTserver.java | 8 +-
.../apache/accumulo/test/zookeeper/ZooCacheIT.java | 49 ++--
.../test/zookeeper/ZooKeeperTestingServer.java | 34 +--
138 files changed, 2059 insertions(+), 2409 deletions(-)
delete mode 100644
core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
delete mode 100644
core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
create mode 100644
core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
delete mode 100644
core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactoryTest.java
delete mode 100644
core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooSessionTest.java
create mode 100644
core/src/test/java/org/apache/accumulo/core/zookeeper/ZooSessionTest.java
delete mode 100644
server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropUtils.java
delete mode 100644
server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropUtilsTest.java
