You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2023/05/04 17:08:57 UTC
[accumulo] 01/01: Merge remote-tracking branch 'upstream/main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 899a95a18be20433038691df7aa0e8515a60c402
Merge: 950c806e20 de73759c24
Author: Keith Turner <kt...@apache.org>
AuthorDate: Thu May 4 13:08:34 2023 -0400
Merge remote-tracking branch 'upstream/main' into elasticity
.github/ISSUE_TEMPLATE/post_vote_checklist.md | 5 +-
.github/workflows/scripts.yaml | 16 +
LICENSE | 3 +-
assemble/bin/accumulo-cluster | 8 -
assemble/bin/accumulo-service | 6 -
assemble/build.sh | 2 +-
assemble/conf/accumulo-env.sh | 4 +-
assemble/src/main/resources/LICENSE | 3 +-
contrib/ci/install-thrift.sh | 31 ++
contrib/ci/run-thrift.sh | 35 ++
.../accumulo/core/clientImpl/ClientContext.java | 6 +-
.../core/clientImpl/TableOperationsImpl.java | 35 +-
.../accumulo/core/conf/ConfigurationDocGen.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java | 11 +-
.../java/org/apache/accumulo/core/data/Range.java | 22 +-
.../blockfile/cache/tinylfu/TinyLfuBlockCache.java | 2 +-
.../core/iterators/IteratorEnvironment.java | 13 -
.../core/iteratorsImpl/system/MapFileIterator.java | 16 +-
.../system/SourceSwitchingIterator.java | 12 +-
.../apache/accumulo/core/logging/TabletLogger.java | 2 +-
.../manager/balancer/AssignmentParamsImpl.java | 2 +-
.../core/manager/balancer/BalanceParamsImpl.java | 2 +-
.../core/manager/balancer/TServerStatusImpl.java | 2 +-
.../core/manager/balancer/TableStatisticsImpl.java | 2 +-
.../core/metadata/schema/MetadataSchema.java | 17 +
.../core/metadata/schema/TabletMetadata.java | 4 +-
.../core/metadata/schema/TabletsMetadata.java | 2 +
.../accumulo/core/metrics/MetricsProducer.java | 10 +-
.../accumulo/core/rpc/clients/TServerClient.java | 2 +-
.../core/spi/balancer/SimpleLoadBalancer.java | 6 -
.../accumulo/core/spi/crypto/AESCryptoService.java | 4 +-
.../spi/crypto/PerTableCryptoServiceFactory.java | 2 +-
.../accumulo/core/spi/fs/DelegatingChooser.java | 4 +-
.../core/spi/fs/PreferredVolumeChooser.java | 2 +-
.../org/apache/accumulo/core/util/Encoding.java | 6 +-
.../core/util/compaction/CompactionJobImpl.java | 2 +-
.../util/compaction/ExternalCompactionUtil.java | 2 +-
.../core/util/interpret/ScanInterpreter.java | 41 ---
core/src/main/scripts/generate-thrift.sh | 2 +-
core/src/main/spotbugs/exclude-filter.xml | 6 -
.../thrift/BulkImportState.java | 2 +-
.../thrift/BulkImportStatus.java | 6 +-
.../{master => manager}/thrift/Compacting.java | 2 +-
.../accumulo/core/manager/thrift/FateService.java | 76 ++--
.../core/manager/thrift/ManagerClientService.java | 32 +-
.../core/manager/thrift/ManagerMonitorInfo.java | 304 +++++++--------
.../core/manager/thrift/RecoveryException.java | 406 ---------------------
.../{master => manager}/thrift/RecoveryStatus.java | 2 +-
.../core/{master => manager}/thrift/TableInfo.java | 2 +-
.../thrift/TabletServerStatus.java | 122 +++----
.../thrift/TabletServerClientService.java | 44 +--
core/src/main/thrift/manager.thrift | 79 +++-
core/src/main/thrift/master.thrift | 92 -----
core/src/main/thrift/tabletingest.thrift | 1 -
core/src/main/thrift/tabletscan.thrift | 1 -
core/src/main/thrift/tabletserver.thrift | 3 +-
.../org/apache/accumulo/core/WithTestNames.java | 2 +-
.../core/conf/AccumuloConfigurationTest.java | 32 +-
.../core/iterators/DefaultIteratorEnvironment.java | 14 -
.../system/SourceSwitchingIteratorTest.java | 7 +-
.../BaseHostRegexTableLoadBalancerTest.java | 34 +-
.../core/spi/balancer/GroupBalancerTest.java | 2 +-
.../core/spi/balancer/SimpleLoadBalancerTest.java | 6 +-
.../core/spi/balancer/TableLoadBalancerTest.java | 6 +-
.../mapreduce/FileOutputFormatBuilderImpl.java | 12 +-
.../mapreduce/InputFormatBuilderImpl.java | 6 +-
.../mapreduce/OutputFormatBuilderImpl.java | 2 +-
.../src/main/spotbugs/exclude-filter.xml | 5 -
.../apache/accumulo/hadoop/its/WithTestNames.java | 2 +-
.../mapreduce/InputFormatBuilderTest.java | 2 +-
.../accumulo/minicluster/MiniAccumuloRunner.java | 2 +-
.../MiniAccumuloClusterControl.java | 2 +-
minicluster/src/main/spotbugs/exclude-filter.xml | 31 --
.../apache/accumulo/minicluster/WithTestNames.java | 2 +-
pom.xml | 40 +-
.../org/apache/accumulo/server/AbstractServer.java | 23 +-
.../server/client/ClientServiceHandler.java | 11 +-
.../server/fs/VolumeChooserEnvironmentImpl.java | 2 +-
.../iterators/TabletIteratorEnvironment.java | 11 -
.../accumulo/server/manager/LiveTServerSet.java | 4 +-
.../server/manager/state/MetaDataTableScanner.java | 1 +
.../accumulo/server/metrics/ProcessMetrics.java | 38 +-
.../accumulo/server/problems/ProblemReport.java | 16 +-
.../accumulo/server/problems/ProblemReports.java | 10 +-
.../apache/accumulo/server/rpc/TimedProcessor.java | 2 +-
.../server/security/SecurityOperation.java | 7 -
.../server/security/handler/ZKAuthenticator.java | 52 +--
.../server/security/handler/ZKSecurityTool.java | 64 ----
.../org/apache/accumulo/server/util/ECAdmin.java | 2 +-
.../apache/accumulo/server/util/ListInstances.java | 2 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 4 +-
.../server/util/ServerBulkImportStatus.java | 4 +-
.../apache/accumulo/server/util/TableInfoUtil.java | 6 +-
.../accumulo/server/util/TabletServerLocks.java | 2 +-
server/base/src/main/spotbugs/exclude-filter.xml | 31 --
.../org/apache/accumulo/server/WithTestNames.java | 2 +-
.../server/problems/ProblemReportTest.java | 7 +-
.../security/handler/ZKAuthenticatorTest.java | 68 +---
.../accumulo/server/util/TableDiskUsageTest.java | 15 +-
.../coordinator/CompactionCoordinator.java | 1 +
.../org/apache/accumulo/compactor/Compactor.java | 10 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
server/gc/src/main/spotbugs/exclude-filter.xml | 31 --
.../accumulo/manager/FateServiceHandler.java | 2 +-
.../java/org/apache/accumulo/manager/Manager.java | 12 +-
.../accumulo/manager/TabletGroupWatcher.java | 2 +-
.../accumulo/manager/metrics/ManagerMetrics.java | 22 +-
.../accumulo/manager/state/SetGoalState.java | 13 +-
.../manager/tableOps/bulkVer2/BulkImportMove.java | 2 +-
.../tableOps/bulkVer2/CleanUpBulkImport.java | 2 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 2 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 1 -
.../manager/tserverOps/ShutdownTServer.java | 2 +-
.../manager/upgrade/RenameMasterDirInZK.java | 71 ----
.../manager/src/main/spotbugs/exclude-filter.xml | 31 --
.../org/apache/accumulo/manager/WithTestNames.java | 2 +-
.../manager/tableOps/ShutdownTServerTest.java | 4 +-
.../src/main/appended-resources/META-INF/LICENSE | 3 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 10 +-
.../apache/accumulo/monitor/rest/XMLResource.java | 2 +-
.../rest/bulkImports/BulkImportInformation.java | 2 +-
.../rest/bulkImports/BulkImportResource.java | 4 +-
.../TabletServerBulkImportInformation.java | 2 +-
.../monitor/rest/compactions/CompactionInfo.java | 2 +-
.../rest/compactions/CompactionsResource.java | 2 +-
.../monitor/rest/manager/ManagerResource.java | 2 +-
.../accumulo/monitor/rest/scans/ScansResource.java | 2 +-
.../monitor/rest/tables/TableInformation.java | 2 +-
.../monitor/rest/tables/TablesResource.java | 4 +-
.../rest/trace/RecoveryStatusInformation.java | 2 +-
.../monitor/rest/tservers/TabletServer.java | 2 +-
.../rest/tservers/TabletServerInformation.java | 6 +-
.../rest/tservers/TabletServerResource.java | 4 +-
.../rest/tservers/TabletServerInformationTest.java | 10 +-
.../org/apache/accumulo/tserver/ScanServer.java | 4 +-
.../accumulo/tserver/TabletClientHandler.java | 4 +-
.../org/apache/accumulo/tserver/TabletServer.java | 33 +-
.../tserver/TabletServerResourceManager.java | 2 +-
.../tserver/compactions/CompactionService.java | 6 +-
.../org/apache/accumulo/tserver/log/DfsLogger.java | 2 +-
.../org/apache/accumulo/tserver/log/LogSorter.java | 2 +-
.../accumulo/tserver/tablet/CompactableImpl.java | 32 +-
.../accumulo/tserver/tablet/DatafileManager.java | 6 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 6 +-
.../tserver/src/main/spotbugs/exclude-filter.xml | 31 --
.../org/apache/accumulo/tserver/WithTestNames.java | 2 +-
.../tserver/tablet/CompactableImplTest.java | 2 +-
.../main/java/org/apache/accumulo/shell/Shell.java | 6 +-
.../shell/commands/BulkImportListIterator.java | 4 +-
.../accumulo/shell/commands/DeleteManyCommand.java | 8 +-
.../accumulo/shell/commands/FormatterCommand.java | 39 --
.../accumulo/shell/commands/GrepCommand.java | 7 +-
.../shell/commands/InterpreterCommand.java | 45 ---
.../accumulo/shell/commands/MaxRowCommand.java | 6 +-
.../accumulo/shell/commands/ScanCommand.java | 124 +------
shell/src/main/spotbugs/exclude-filter.xml | 31 --
.../shell/commands/ListBulkCommandTest.java | 6 +-
.../accumulo/start/spi/KeywordExecutable.java | 2 +-
.../org/apache/accumulo/harness/WithTestNames.java | 2 +-
.../org/apache/accumulo/test/GetManagerStats.java | 8 +-
.../org/apache/accumulo/test/TotalQueuedIT.java | 2 +-
.../compaction/ExternalCompactionTestUtils.java | 4 +-
.../functional/BalanceAfterCommsFailureIT.java | 4 +-
.../BalanceInPresenceOfOfflineTableIT.java | 2 +-
.../test/functional/GarbageCollectorIT.java | 4 +-
.../test/functional/MemoryStarvedMajCIT.java | 15 +-
.../test/functional/MemoryStarvedMinCIT.java | 17 +-
.../test/functional/MemoryStarvedScanIT.java | 60 ++-
.../accumulo/test/functional/MetadataIT.java | 4 +-
.../test/functional/MetadataMaxFilesIT.java | 4 +-
.../test/functional/SimpleBalancerFairnessIT.java | 4 +-
.../accumulo/test/functional/YieldingIterator.java | 9 +-
.../accumulo/test/functional/ZombieTServer.java | 2 +-
.../accumulo/test/performance/NullTserver.java | 2 +-
.../org/apache/accumulo/test/shell/ShellIT.java | 11 +-
test/src/main/spotbugs/exclude-filter.xml | 5 -
.../accumulo/test/ChaoticLoadBalancerTest.java | 6 +-
177 files changed, 978 insertions(+), 1993 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index 2dcd024750,4d72bdf061..b764ac1417
--- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@@ -63,8 -61,8 +63,9 @@@ import org.apache.accumulo.core.clientI
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
+import org.apache.accumulo.core.dataImpl.thrift.TRange;
import org.apache.accumulo.core.fate.ReadOnlyTStore.TStatus;
+ import org.apache.accumulo.core.manager.thrift.BulkImportState;
import org.apache.accumulo.core.manager.thrift.FateOperation;
import org.apache.accumulo.core.manager.thrift.FateService;
import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
index f37eb70519,9539fd6fa4..5b057ca374
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
@@@ -76,9 -75,8 +76,9 @@@ import org.apache.accumulo.core.fate.zo
import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
import org.apache.accumulo.core.lock.ServiceLock;
import org.apache.accumulo.core.logging.TabletLogger;
+import org.apache.accumulo.core.manager.state.tables.TableState;
- import org.apache.accumulo.core.master.thrift.BulkImportState;
- import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+ import org.apache.accumulo.core.manager.thrift.BulkImportState;
+ import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.TabletFile;