[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit e967402f600534c1afc9fd1a29f4a46147f21abf
Merge: 214aeaf a77edef
Author: Dave Marion
AuthorDate: Mon Mar 8 20:41:59 2021 +
Merge branch 'main' into 1451-external-compactions-feature
.../file/blockfile/impl/ScanCacheProvider.java | 8 +--
...tionDirectives.java => CompactionDispatch.java} | 10 +--
...Builder.java => CompactionDispatchBuilder.java} | 12 ++--
...ctivesImpl.java => CompactionDispatchImpl.java} | 6 +-
.../core/spi/compaction/CompactionDispatcher.java | 2 +-
.../spi/compaction/SimpleCompactionDispatcher.java | 22 +++
...canDirectives.java => DefaultScanDispatch.java} | 17 +++--
.../{ScanDirectives.java => ScanDispatch.java} | 12 ++--
...anDirectivesImpl.java => ScanDispatchImpl.java} | 12 ++--
.../accumulo/core/spi/scan/ScanDispatcher.java | 8 +--
.../core/spi/scan/SimpleScanDispatcher.java| 52
.../apache/accumulo/fate/zookeeper/ZooLock.java| 3 +-
.../core/spi/scan/SimpleScanDispatcherTest.java| 14 ++---
.../accumulo/minicluster/MiniAccumuloCluster.java | 15 -
.../accumulo/minicluster/MiniAccumuloConfig.java | 15 +
.../MiniAccumuloClusterExistingZooKeepersTest.java | 72 +++---
.../tserver/TabletServerResourceManager.java | 14 ++---
.../accumulo/tserver/scan/ScanParameters.java | 12 ++--
.../accumulo/tserver/tablet/CompactableImpl.java | 4 +-
.../accumulo/tserver/tablet/ScanDataSource.java| 3 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-
21 files changed, 159 insertions(+), 158 deletions(-)
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 654b2736b4a08e67417f60d8e6a7bf6d07b30aa7
Merge: 9ccadb8 183387a
Author: Dave Marion
AuthorDate: Mon Apr 12 13:27:05 2021 +
Merge branch 'main' into 1451-external-compactions-feature
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/ratelimit/SharedRateLimiterFactory.java
server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
server/base/src/main/java/org/apache/accumulo/server/util/ManagerMetadataUtil.java
.../accumulo/core/clientImpl/ClientContext.java| 5 +-
.../core/clientImpl/ConditionalWriterImpl.java | 4 +-
.../accumulo/core/clientImpl/ServerClient.java | 6 +-
.../core/clientImpl/ZookeeperLockChecker.java | 5 +-
.../org/apache/accumulo/core/conf/Property.java| 24
.../apache/accumulo/core/logging/FateLogger.java | 5 +
.../accumulo/core/metadata/schema/Ample.java | 4 +-
.../core/metadata/schema/TabletMetadata.java | 6 +-
.../util/ratelimit/SharedRateLimiterFactory.java | 99
.../java/org/apache/accumulo/fate/AdminUtil.java | 49 ++--
.../java/org/apache/accumulo/fate/AgeOffStore.java | 5 +
.../org/apache/accumulo/fate/ReadOnlyStore.java| 5 +
.../org/apache/accumulo/fate/ReadOnlyTStore.java | 8 ++
.../java/org/apache/accumulo/fate/ZooStore.java| 13 +++
.../zookeeper/{ZooQueueLock.java => FateLock.java} | 104 ++---
.../zookeeper/{ZooLock.java => ServiceLock.java} | 101 +
.../apache/accumulo/fate/zookeeper/ZooCache.java | 5 +-
.../apache/accumulo/core/data/KeyExtentTest.java | 8 --
.../apache/accumulo/core/data/MutationTest.java| 3 +
.../core/file/rfile/MultiThreadedRFileTest.java| 8 --
.../accumulo/core/file/rfile/RelativeKeyTest.java | 1 +
.../core/iterators/system/MultiIteratorTest.java | 9 --
.../accumulo/core/iterators/user/CombinerTest.java | 5 -
.../iterators/user/IndexedDocIteratorTest.java | 1 -
.../iterators/user/IntersectingIteratorTest.java | 2 -
.../java/org/apache/accumulo/fate/SimpleStore.java | 5 +
.../{ZooLockTest.java => ServiceLockTest.java} | 14 +--
pom.xml| 36 +-
.../server/compaction/ExternalCompactionUtil.java | 5 +-
.../server/constraints/MetadataConstraints.java| 4 +-
.../org/apache/accumulo/server/fs/VolumeUtil.java | 4 +-
.../accumulo/server/manager/LiveTServerSet.java| 24 ++--
.../server/metadata/TabletMutatorBase.java | 4 +-
.../org/apache/accumulo/server/util/Admin.java | 5 +-
.../apache/accumulo/server/util/ListInstances.java | 7 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 14 +--
.../accumulo/server/util/MetadataTableUtil.java| 38 ---
.../accumulo/server/util/TabletServerLocks.java| 7 +-
.../org/apache/accumulo/server/util/ZooZap.java| 8 +-
.../server/master/balancer/GroupBalancerTest.java | 4 -
.../coordinator/CompactionCoordinator.java | 7 +-
.../coordinator/CoordinatorLockWatcher.java| 6 +-
.../org/apache/accumulo/compactor/Compactor.java | 11 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 12 +-
.../java/org/apache/accumulo/manager/Manager.java | 19 ++--
.../apache/accumulo/manager/tableOps/Utils.java| 7 +-
.../manager/tableOps/create/PopulateMetadata.java | 6 +-
.../manager/tserverOps/ShutdownTServer.java| 13 ++-
.../apache/accumulo/manager/util/FateAdmin.java| 7 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 26 ++---
.../org/apache/accumulo/tracer/TracerTest.java | 17 +--
.../org/apache/accumulo/tserver/TabletServer.java | 20 ++--
.../accumulo/tserver/ThriftClientHandler.java | 6 +-
.../apache/accumulo/tserver/InMemoryMapTest.java | 16 ---
.../tablet/TabletMutationPrepAttemptTest.java | 4 +-
.../main/java/org/apache/accumulo/shell/Shell.java | 23 ++--
.../shell/commands/DeleteScanIterCommand.java | 3 +-
.../accumulo/shell/commands/FateCommand.java | 7 +-
.../accumulo/shell/commands/ScriptCommand.java | 19 ++--
.../shell/commands/SetScanIterCommand.java | 3 +-
.../start/classloader/vfs/ContextManager.java | 5 +-
.../accumulo/test/BadDeleteMarkersCreatedIT.java | 10 +-
.../{ZooLockIT.java => ServiceLockIT.java} | 125 +++--
.../accumulo/test/functional/BackupManagerIT.java | 6 +-
.../test/functional/GarbageCollectorIT.java| 12 +-
.../accumulo/test/functional/ReadWriteIT.java | 10 +-
.../apache/accumulo/test/functional/RestartIT.java | 18 ++-
.../accumulo/test/functional/SplitRecoveryIT.java | 16 +--
.../functional/TabletStateChangeIteratorIT.java| 8
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1451-external-compactions-feature in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 3aa65f8e072a2b5363fed30421fa64e63d14aeca Merge: 703710e 8dfe443 Author: Dave Marion AuthorDate: Tue Apr 20 13:49:08 2021 + Merge branch 'main' into 1451-external-compactions-feature Conflicts: core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java core/src/main/scripts/generate-thrift.sh server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java .github/workflows/maven-full-its.yaml | 19 +- .github/workflows/maven-on-demand.yaml | 17 +- .github/workflows/maven.yaml | 19 +- .../core/client/sample/RowColumnSampler.java | 2 +- .../accumulo/core/client/sample/RowSampler.java| 2 +- .../client/summary/SummarizerConfiguration.java| 5 +- .../accumulo/core/clientImpl/ManagerClient.java| 2 +- .../core/clientImpl/NamespaceOperationsImpl.java | 2 +- .../apache/accumulo/core/clientImpl/TableMap.java | 4 +- .../core/clientImpl/TableOperationsImpl.java | 4 +- .../accumulo/core/conf/AccumuloConfiguration.java | 2 +- .../org/apache/accumulo/core/data/LoadPlan.java| 2 +- .../core/metadata/schema/TabletMetadata.java | 17 +- .../core/spi/scan/HintScanPrioritizer.java | 18 +- .../core/spi/scan/SimpleScanDispatcher.java| 42 +- .../accumulo/core/summary/SummarySerializer.java | 2 +- .../accumulo/core/util/ConfigurationImpl.java | 12 +- .../accumulo/core/util/LocalityGroupUtil.java | 35 +- core/src/main/scripts/generate-thrift.sh | 4 +- core/src/main/spotbugs/exclude-filter.xml | 1 + .../core/clientImpl/thrift/ClientService.java | 0 .../core/clientImpl/thrift/ConfigurationType.java | 0 .../core/clientImpl/thrift/SecurityErrorCode.java | 0 .../core/clientImpl/thrift/TDiskUsage.java | 0 .../core/clientImpl/thrift/TableOperation.java | 0 .../thrift/TableOperationExceptionType.java| 0 .../thrift/ThriftNotActiveServiceException.java| 0 .../clientImpl/thrift/ThriftSecurityException.java | 0 .../thrift/ThriftTableOperationException.java | 0 .../core/clientImpl/thrift/ThriftTest.java | 0 .../core/dataImpl/thrift/InitialMultiScan.java | 0 .../accumulo/core/dataImpl/thrift/InitialScan.java | 0 .../accumulo/core/dataImpl/thrift/IterInfo.java| 0 .../accumulo/core/dataImpl/thrift/MapFileInfo.java | 0 .../core/dataImpl/thrift/MultiScanResult.java | 0 .../accumulo/core/dataImpl/thrift/ScanResult.java | 0 .../accumulo/core/dataImpl/thrift/TCMResult.java | 0 .../accumulo/core/dataImpl/thrift/TCMStatus.java | 0 .../accumulo/core/dataImpl/thrift/TColumn.java | 0 .../accumulo/core/dataImpl/thrift/TCondition.java | 0 .../core/dataImpl/thrift/TConditionalMutation.java | 0 .../core/dataImpl/thrift/TConditionalSession.java | 0 .../thrift/TConstraintViolationSummary.java| 0 .../apache/accumulo/core/dataImpl/thrift/TKey.java | 0 .../accumulo/core/dataImpl/thrift/TKeyExtent.java | 0 .../accumulo/core/dataImpl/thrift/TKeyValue.java | 0 .../accumulo/core/dataImpl/thrift/TMutation.java | 0 .../accumulo/core/dataImpl/thrift/TRange.java | 0 .../accumulo/core/dataImpl/thrift/TRowRange.java | 0 .../accumulo/core/dataImpl/thrift/TSummaries.java | 0 .../dataImpl/thrift/TSummarizerConfiguration.java | 0 .../accumulo/core/dataImpl/thrift/TSummary.java| 0 .../core/dataImpl/thrift/TSummaryRequest.java | 0 .../core/dataImpl/thrift/UpdateErrors.java | 0 .../accumulo/core/gc/thrift/GCMonitorService.java | 0 .../apache/accumulo/core/gc/thrift/GCStatus.java | 0 .../accumulo/core/gc/thrift/GcCycleStats.java | 0 .../accumulo/core/manager}/thrift/DeadServer.java | 2 +- .../core/manager}/thrift/FateOperation.java| 2 +- .../accumulo/core/manager}/thrift/FateService.java | 242 .../core/manager}/thrift/ManagerClientService.java | 676 ++--- .../core/manager}/thrift/ManagerGoalState.java | 4 +- .../core/manager}/thrift/ManagerMonitorInfo.java | 374 ++-- .../core/manager}/thrift/ManagerState.java | 4 +- .../core/manager}/thrift/RecoveryException.java| 2 +- .../core/manager}/thrift/TabletLoadState.java | 2 +- .../accumulo/core/manager}/thrift/TabletSplit.java | 38 +- .../core/master/thrift/BulkImportState.java| 0 .../core/master/thrift/BulkImportStatus.java | 0 .../accumulo/core/master/thrift/Compacting.java| 0 .../core/master/thrift/RecoveryStatus.java | 0 .../accumulo/core/master/thrift/TableInfo.java | 0 .../core/master/thrift/TabletServerStatus.java |
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1451-external-compactions-feature in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 4d3117faad5e12bc515ed5b6a2c6debc8546ddf7 Merge: 54d6c37 f9bc914 Author: Dave Marion AuthorDate: Tue Apr 27 10:49:01 2021 + Merge branch 'main' into 1451-external-compactions-feature assemble/src/main/scripts/create-jshell.sh | 31 ++-- core/pom.xml | 33 ++ pom.xml| 2 +- server/tserver/pom.xml | 25 ++ 4 files changed, 88 insertions(+), 3 deletions(-)
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 6daea692c0838d769a42657ba432385c0f69c035
Merge: 857231c 7778203
Author: Dave Marion
AuthorDate: Mon May 3 19:30:51 2021 +
Merge branch 'main' into 1451-external-compactions-feature
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
core/pom.xml | 2 +
.../org/apache/accumulo/core/cli/ClientOpts.java | 2 +-
.../core/client/admin/TableOperations.java | 7 ++
.../core/clientImpl/NamespaceOperationsImpl.java | 2 +-
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../accumulo/core/clientImpl/bulk/BulkImport.java | 18 +++-
.../apache/accumulo/core/conf/IterConfigUtil.java | 2 +-
.../org/apache/accumulo/core/conf/Property.java| 2 +-
.../accumulo/core/constraints/Constraint.java | 26 ++
.../core/constraints/DefaultKeySizeConstraint.java | 13 ++-
.../core/constraints/NoDeleteConstraint.java | 12 ++-
.../accumulo/core/constraints/Violations.java | 4 +-
.../core/constraints/VisibilityConstraint.java | 13 ++-
.../core/{ => data}/constraints/Constraint.java| 19 +++--
.../constraints/DefaultKeySizeConstraint.java | 4 +-
.../{ => data}/constraints/NoDeleteConstraint.java | 4 +-
.../constraints/VisibilityConstraint.java | 4 +-
.../apache/accumulo/core/file/FileOperations.java | 12 ++-
.../accumulo/core/iterators/LongCombiner.java | 4 +-
.../core/metadata/CompactableFileImpl.java | 2 +-
.../accumulo/core/singletons/SingletonManager.java | 2 +-
.../core/singletons/SingletonReservation.java | 2 +-
.../core/spi/balancer/TableLoadBalancer.java | 6 +-
.../org/apache/accumulo/core/util/MapCounter.java | 2 +-
.../apache/accumulo/core/volume/VolumeImpl.java| 2 +-
.../client/security/tokens/KerberosTokenTest.java | 4 +-
.../constraints/DefaultKeySizeConstraintTest.java | 1 +
.../DeprecatedConstraintExtendTest.java| 97 ++
.../core/constraints/NoDeleteConstraintTest.java | 1 +
.../VisibilityConstraintTest.java | 11 +--
.../constraints/DefaultKeySizeConstraintTest.java | 7 +-
.../constraints/NoDeleteConstraintTest.java| 2 +-
.../constraints}/VisibilityConstraintTest.java | 7 +-
.../core/iterators/user/RowFilterTest.java | 25 +++---
.../org/apache/accumulo/core/util/NumUtilTest.java | 3 +
.../org/apache/accumulo/fate/AgeOffStoreTest.java | 23 +++--
.../server/constraints/MetadataConstraints.java| 16 ++--
.../server/constraints/SystemEnvironment.java | 2 +-
.../server/metadata/RootTabletMutatorImpl.java | 15 +++-
.../security/handler/KerberosAuthenticator.java| 7 +-
.../accumulo/server/util/FileSystemMonitor.java| 8 +-
.../tserver/TabletServerResourceManager.java | 8 +-
.../accumulo/tserver/TservConstraintEnv.java | 21 +++--
.../tserver/constraints/ConstraintChecker.java | 32 +--
.../tserver/constraints/SystemConstraint.java | 2 +-
.../constraints/UnsatisfiableConstraint.java | 2 +-
.../accumulo/tserver/tablet/CompactableImpl.java | 2 +-
.../tserver/constraints/ConstraintCheckerTest.java | 34
.../accumulo/shell/commands/ConstraintCommand.java | 2 +-
.../shell/commands/CreateTableCommand.java | 2 +-
.../shell/commands/ImportDirectoryCommand.java | 13 ++-
.../apache/accumulo/shell/commands/OptUtil.java| 20 +
.../shell/commands/DeleteTableCommandTest.java | 9 +-
.../shell/commands/ImportDirectoryCommandTest.java | 6 ++
.../org/apache/accumulo/test/OrIteratorIT.java | 3 +-
.../org/apache/accumulo/test/ShellServerIT.java| 75 ++---
.../apache/accumulo/test/TableOperationsIT.java| 2 +-
.../test/constraints/AlphaNumKeyConstraint.java| 2 +-
.../accumulo/test/constraints/MaxMutationSize.java | 2 +-
.../test/constraints/NumericValueConstraint.java | 2 +-
.../apache/accumulo/test/functional/BulkIT.java| 18
.../apache/accumulo/test/functional/BulkNewIT.java | 29 +++
.../accumulo/test/functional/ManagerMetricsIT.java | 11 +--
.../accumulo/test/functional/PermissionsIT.java| 3 +-
.../accumulo/test/functional/SlowConstraint.java | 2 +-
65 files changed, 495 insertions(+), 204 deletions(-)
diff --cc
server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index a398a71,fe61b55..0c598d7
---
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@@ -96,8 -95,7 +96,8
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1451-external-compactions-feature in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c351f504776b3e1b639a8a476db2c8ae34253064 Merge: 08fccf7 16a3cec Author: Dave Marion AuthorDate: Wed May 5 11:19:53 2021 + Merge branch 'main' into 1451-external-compactions-feature .../accumulo/core/constraints/Constraint.java | 11 +++ .../main/java/org/apache/accumulo/fate/Fate.java | 6 ++-- .../DeprecatedConstraintExtendTest.java| 38 -- server/base/pom.xml| 27 +++ 4 files changed, 77 insertions(+), 5 deletions(-)
[accumulo] 01/01: Merge branch 'main' into 1451-external-compactions-feature
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 1451-external-compactions-feature in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 02f2616f2618129f65e7a49b98a59cf563f85b1d Merge: 7551e7c 6a0a5ee Author: Dave Marion AuthorDate: Mon May 10 14:26:12 2021 + Merge branch 'main' into 1451-external-compactions-feature CONTRIBUTING.md => .github/CONTRIBUTING.md | 5 +- README.md | 13 - .../org/apache/accumulo/core/data/KeyTest.java | 21 - .../apache/accumulo/server/MockServerContext.java | 55 ++ .../accumulo/server/client/BulkImporterTest.java | 11 + .../server/conf/NamespaceConfigurationTest.java| 10 +--- .../conf/ServerConfigurationFactoryTest.java | 16 +-- .../server/conf/TableConfigurationTest.java| 10 +--- .../server/conf/ZooConfigurationFactoryTest.java | 7 +-- .../master/balancer/TableLoadBalancerTest.java | 10 +--- .../server/problems/ProblemReportTest.java | 4 +- .../security/handler/ZKAuthenticatorTest.java | 7 ++- 12 files changed, 94 insertions(+), 75 deletions(-)
