This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 0f0814ccd4 Merge branch '2.1'
add 63ffb03686 Reset Thread interrupted state after catching
InterruptedException (#6438)
new 1234b63704 Merge branch '2.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:
.../core/clientImpl/ConditionalWriterImpl.java | 1 +
.../core/clientImpl/InstanceOperationsImpl.java | 4 ++++
.../core/clientImpl/NamespaceOperationsImpl.java | 1 +
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../TabletServerBatchReaderIterator.java | 4 ++++
.../core/clientImpl/TabletServerBatchWriter.java | 2 ++
.../accumulo/core/clientImpl/ThriftScanner.java | 2 ++
.../core/clientImpl/ThriftTransportPool.java | 1 +
.../accumulo/core/clientImpl/bulk/BulkImport.java | 1 +
.../file/blockfile/cache/lru/LruBlockCache.java | 3 ++-
.../org/apache/accumulo/core/lock/ServiceLock.java | 9 ++++++++
.../accumulo/core/lock/ServiceLockSupport.java | 2 +-
.../accumulo/core/rpc/UGIAssumingTransport.java | 1 +
.../apache/accumulo/core/util/UtilWaitThread.java | 1 +
.../util/compaction/ExternalCompactionUtil.java | 4 ++++
.../accumulo/core/util/threads/ThreadPools.java | 1 +
.../org/apache/accumulo/core/data/TableIdTest.java | 1 +
.../core/file/rfile/MultiThreadedRFileTest.java | 1 +
.../accumulo/minicluster/MiniAccumuloRunner.java | 1 +
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 1 +
.../MiniAccumuloClusterStartStopTest.java | 3 +++
.../org/apache/accumulo/server/AbstractServer.java | 4 ++++
.../server/compaction/RetryableThriftCall.java | 1 +
.../server/conf/store/impl/ZooPropLoader.java | 3 +++
.../server/conf/store/impl/ZooPropStore.java | 6 +++++
.../accumulo/server/conf/util/ZooPropEditor.java | 3 +++
.../accumulo/server/fs/VolumeManagerImpl.java | 3 +++
.../apache/accumulo/server/init/Initialize.java | 3 +++
.../accumulo/server/init/ZooKeeperInitializer.java | 3 +++
.../accumulo/server/log/WalStateManager.java | 24 +++++++++++++++++++
.../accumulo/server/metadata/ServerAmpleImpl.java | 3 +++
.../delegation/AuthenticationTokenKeyManager.java | 7 ++++++
.../AuthenticationTokenSecretManager.java | 3 +++
.../delegation/ZooAuthenticationKeyWatcher.java | 6 +++++
.../security/handler/KerberosAuthenticator.java | 4 ++++
.../server/security/handler/ZKAuthenticator.java | 6 +++++
.../server/security/handler/ZKAuthorizor.java | 6 +++++
.../server/security/handler/ZKPermHandler.java | 18 +++++++++++++++
.../apache/accumulo/server/util/UpgradeUtil.java | 27 ++++++++++++++++++++++
.../org/apache/accumulo/server/util/ZooZap.java | 9 ++++++++
.../server/zookeeper/DistributedWorkQueue.java | 3 +++
.../server/conf/store/impl/ReadyMonitorTest.java | 4 ++++
.../org/apache/accumulo/compactor/Compactor.java | 4 ++++
.../main/java/org/apache/accumulo/gc/GCRun.java | 1 +
.../accumulo/gc/GarbageCollectWriteAheadLogs.java | 6 +++++
.../apache/accumulo/gc/SimpleGarbageCollector.java | 4 ++++
.../apache/accumulo/manager/EventCoordinator.java | 1 +
.../java/org/apache/accumulo/manager/Manager.java | 23 +++++++++++++++++-
.../java/org/apache/accumulo/monitor/Monitor.java | 1 +
.../org/apache/accumulo/tserver/ScanServer.java | 2 ++
.../org/apache/accumulo/tserver/TabletServer.java | 4 ++++
.../tserver/TabletServerResourceManager.java | 5 +++-
.../accumulo/tserver/UnloadTabletHandler.java | 4 +++-
.../org/apache/accumulo/tserver/WriteTracker.java | 1 +
.../org/apache/accumulo/tserver/log/DfsLogger.java | 3 +++
.../accumulo/tserver/log/TabletServerLogger.java | 1 +
.../accumulo/tserver/session/SessionManager.java | 1 +
.../accumulo/tserver/tablet/CommitSession.java | 1 +
.../accumulo/tserver/tablet/MinorCompactor.java | 3 +++
.../apache/accumulo/tserver/tablet/Scanner.java | 2 ++
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 ++++
.../accumulo/tserver/tablet/TabletMemory.java | 1 +
.../apache/accumulo/test/BatchWriterIterator.java | 4 +++-
.../apache/accumulo/test/MultiTableRecoveryIT.java | 3 +++
.../apache/accumulo/test/ScanConsistencyIT.java | 1 +
.../accumulo/test/ScanServerMultipleScansIT.java | 4 ++++
.../org/apache/accumulo/test/ZombieScanIT.java | 1 +
.../test/ZooKeeperPropertiesIT_SimpleSuite.java | 4 ++++
.../test/functional/ConcurrentDeleteTableIT.java | 6 +++++
.../test/functional/FateConcurrencyIT.java | 3 +++
.../test/functional/FunctionalTestUtils.java | 3 +++
.../test/functional/HalfDeadServerWatcherIT.java | 3 +++
72 files changed, 289 insertions(+), 7 deletions(-)
