This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c96185f18878abcb47ec49f3daa87796007f955f Merge: a0eecdb996 164fa7949d Author: David Capwell <[email protected]> AuthorDate: Wed Sep 27 16:21:37 2023 -0700 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/cassandra.yaml | 11 + .../org/apache/cassandra/concurrent/Stage.java | 6 + src/java/org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 11 + .../org/apache/cassandra/config/RepairConfig.java | 24 + .../apache/cassandra/config/RepairRetrySpec.java | 43 + .../org/apache/cassandra/config/RetrySpec.java | 165 +++ .../org/apache/cassandra/cql3/QueryProcessor.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- src/java/org/apache/cassandra/db/Keyspace.java | 2 +- src/java/org/apache/cassandra/db/ReadCommand.java | 4 +- .../cassandra/db/compaction/CompactionManager.java | 5 +- .../db/compaction/ICompactionManager.java | 24 + .../db/compaction/PendingRepairManager.java | 4 +- .../db/repair/CassandraTableRepairManager.java | 12 +- .../db/repair/CassandraValidationIterator.java | 13 +- .../cassandra/db/repair/PendingAntiCompaction.java | 2 +- .../cassandra/db/virtual/LocalRepairTables.java | 19 +- .../cassandra/exceptions/RepairException.java | 10 +- src/java/org/apache/cassandra/gms/Gossiper.java | 12 +- src/java/org/apache/cassandra/gms/IGossiper.java | 39 + src/java/org/apache/cassandra/net/Message.java | 12 +- .../org/apache/cassandra/net/MessageDelivery.java | 31 + .../org/apache/cassandra/net/MessagingService.java | 72 +- src/java/org/apache/cassandra/net/Verb.java | 43 +- .../cassandra/repair/AbstractRepairTask.java | 44 +- .../cassandra/repair/AsymmetricRemoteSyncTask.java | 7 +- .../cassandra/repair/IValidationManager.java | 28 + .../cassandra/repair/IncrementalRepairTask.java | 17 +- .../org/apache/cassandra/repair/LocalSyncTask.java | 12 +- .../apache/cassandra/repair/NormalRepairTask.java | 7 +- .../apache/cassandra/repair/PreviewRepairTask.java | 7 +- ...{RepairRunnable.java => RepairCoordinator.java} | 162 +-- .../org/apache/cassandra/repair/RepairJob.java | 76 +- .../org/apache/cassandra/repair/RepairJobDesc.java | 11 +- .../cassandra/repair/RepairMessageVerbHandler.java | 250 +++- .../org/apache/cassandra/repair/RepairSession.java | 151 ++- .../org/apache/cassandra/repair/SharedContext.java | 165 +++ .../org/apache/cassandra/repair/SnapshotTask.java | 11 +- .../apache/cassandra/repair/StreamExecutor.java | 27 + .../cassandra/repair/StreamingRepairTask.java | 24 +- .../cassandra/repair/SymmetricRemoteSyncTask.java | 7 +- src/java/org/apache/cassandra/repair/SyncTask.java | 18 +- .../apache/cassandra/repair/ValidationManager.java | 16 +- .../apache/cassandra/repair/ValidationTask.java | 61 +- .../org/apache/cassandra/repair/Validator.java | 25 +- .../repair/consistent/ConsistentSession.java | 9 + .../repair/consistent/CoordinatorSession.java | 38 +- .../repair/consistent/CoordinatorSessions.java | 13 +- .../cassandra/repair/consistent/LocalSession.java | 13 +- .../cassandra/repair/consistent/LocalSessions.java | 36 +- .../cassandra/repair/messages/CleanupMessage.java | 6 + .../cassandra/repair/messages/PrepareMessage.java | 6 + .../cassandra/repair/messages/RepairMessage.java | 179 ++- .../repair/state/AbstractCompletable.java | 28 +- .../cassandra/repair/state/AbstractState.java | 69 +- .../apache/cassandra/repair/state/Completable.java | 33 +- .../cassandra/repair/state/CoordinatorState.java | 41 +- .../apache/cassandra/repair/state/JobState.java | 5 +- .../cassandra/repair/state/ParticipateState.java | 160 ++- .../cassandra/repair/state/SessionState.java | 21 +- .../apache/cassandra/repair/state/SyncState.java | 85 ++ .../cassandra/repair/state/ValidationState.java | 13 +- src/java/org/apache/cassandra/schema/Tables.java | 2 +- .../cassandra/service/ActiveRepairService.java | 270 ++-- .../apache/cassandra/service/CassandraDaemon.java | 2 +- .../apache/cassandra/service/StorageService.java | 24 +- .../cassandra/service/StorageServiceMBean.java | 2 +- .../apache/cassandra/streaming/PreviewKind.java | 2 +- .../org/apache/cassandra/streaming/StreamPlan.java | 16 + .../apache/cassandra/streaming/StreamSession.java | 6 +- .../apache/cassandra/tools/nodetool/Repair.java | 85 +- src/java/org/apache/cassandra/utils/Backoff.java | 96 ++ src/java/org/apache/cassandra/utils/Clock.java | 10 + .../apache/cassandra/utils/FailingBiConsumer.java | 44 + .../org/apache/cassandra/utils/MerkleTree.java | 2 +- .../cassandra/distributed/impl/Instance.java | 4 +- .../mock/nodetool/InternalNodeProbe.java | 2 +- .../distributed/test/ClearSnapshotTest.java | 2 +- .../distributed/test/IncRepairAdminTest.java | 16 +- .../test/IncRepairCoordinatorErrorTest.java | 2 +- .../test/OptimiseStreamsRepairTest.java | 4 +- .../distributed/test/PaxosRepair2Test.java | 2 +- .../distributed/test/PaxosRepairTest.java | 2 +- .../distributed/test/RepairErrorsTest.java | 2 +- test/unit/accord/utils/DefaultRandom.java | 94 ++ test/unit/accord/utils/Gen.java | 179 +++ test/unit/accord/utils/Gens.java | 576 +++++++++ test/unit/accord/utils/Invariants.java | 327 +++++ test/unit/accord/utils/Property.java | 382 ++++++ test/unit/accord/utils/RandomSource.java | 361 ++++++ test/unit/accord/utils/WrappedRandomSource.java | 97 ++ .../concurrent/ForwardingExecutorPlus.java | 219 ++++ .../ForwardingLocalAwareExecutorPlus.java | 167 +++ .../ForwardingScheduledExecutorPlus.java | 92 ++ .../concurrent/SimulatedExecutorFactory.java | 506 ++++++++ .../config/DatabaseDescriptorRefTest.java | 5 + .../cassandra/config/UnitConfigOverride.java | 83 ++ .../config/YamlConfigurationLoaderTest.java | 45 + .../org/apache/cassandra/db/ReadCommandTest.java | 16 +- .../db/compaction/AbstractPendingRepairTest.java | 2 +- .../db/compaction/AntiCompactionTest.java | 10 +- .../db/compaction/CancelCompactionsTest.java | 2 +- ...CompactionStrategyManagerPendingRepairTest.java | 2 +- .../compaction/LeveledCompactionStrategyTest.java | 19 +- .../repair/AbstractPendingAntiCompactionTest.java | 2 +- ...pactionManagerGetSSTablesForValidationTest.java | 30 +- .../db/repair/PendingAntiCompactionTest.java | 30 +- .../db/streaming/CassandraStreamManagerTest.java | 6 +- .../db/virtual/LocalRepairTablesTest.java | 25 +- .../index/sai/functional/CompactionTest.java | 16 +- .../cassandra/repair/AbstractRepairTest.java | 16 +- .../repair/ConcurrentIrWithPreviewFuzzTest.java | 92 ++ .../org/apache/cassandra/repair/FailedAckTest.java | 136 ++ .../cassandra/repair/FailingRepairFuzzTest.java | 162 +++ .../org/apache/cassandra/repair/FuzzTestBase.java | 1296 ++++++++++++++++++++ .../apache/cassandra/repair/HappyPathFuzzTest.java | 62 + .../apache/cassandra/repair/LocalSyncTaskTest.java | 28 +- .../cassandra/repair/NeighborsAndRangesTest.java | 2 +- .../org/apache/cassandra/repair/RepairJobTest.java | 59 +- .../apache/cassandra/repair/RepairSessionTest.java | 2 +- .../cassandra/repair/SlowMessageFuzzTest.java | 64 + .../cassandra/repair/StreamingRepairTaskTest.java | 10 +- .../repair/SymmetricRemoteSyncTaskTest.java | 2 +- .../cassandra/repair/ValidationTaskTest.java | 11 +- .../org/apache/cassandra/repair/ValidatorTest.java | 29 +- .../consistent/AbstractConsistentSessionTest.java | 16 +- .../consistent/CoordinatorMessagingTest.java | 12 +- .../repair/consistent/CoordinatorSessionTest.java | 3 +- .../repair/consistent/CoordinatorSessionsTest.java | 10 +- .../repair/consistent/LocalSessionAccessor.java | 2 +- .../repair/consistent/LocalSessionTest.java | 18 +- .../repair/consistent/PendingRepairStatTest.java | 3 +- .../cassandra/service/ActiveRepairServiceTest.java | 47 +- .../cassandra/service/SerializationsTest.java | 5 +- .../cassandra/tools/JMXCompatabilityTest.java | 12 +- .../org/apache/cassandra/tools/ToolRunner.java | 18 + .../cassandra/utils/CassandraGenerators.java | 68 +- test/unit/org/quicktheories/impl/JavaRandom.java | 6 + 140 files changed, 7609 insertions(+), 924 deletions(-) diff --cc CHANGES.txt index 20588112aa,12ffc27c9b..83ffa9a7d7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Add support for repair coordinator to retry messages that timeout (CASSANDRA-18816) * Upgrade slf4j-api to 1.7.36 (CASSANDRA-18882) * Make the output of ON/OFF commands in cqlsh consistent (CASSANDRA-18547) * Do not create sstable files before registering in txn (CASSANDRA-18737) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
