This is an automated email from the ASF dual-hosted git repository.

belliottsmith pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 4ab8bac4a5 Merge branch 'cassandra-6.0' into trunk
     add 4da20e07e8 Improve Rebootstrap:  - Distinguish corrupt/incomplete 
cases; latter case only refuses uncertain data  - Ensures fresh quorum 
durability before marking own log faulty  - Refuse unsafe operations more 
selectively once log marked faulty  - Simplify and merge logic with standard 
bootstrap, using DurabilityService Also Improve:  - Maintain multiple stale 
timestamp reservations to allow us to issue stale timestamps closer to any 
conflicting transaction  - Maintain richer Ac [...]
     new fb7fe35480 Merge branch 'cassandra-6.0' into trunk

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:
 CHANGES.txt                                        |    1 +
 formalise/accord/execution/README.md               |    2 +-
 .../org/apache/cassandra/config/AccordConfig.java  |   77 +-
 .../config/CassandraRelevantProperties.java        |   16 +-
 .../cassandra/config/DatabaseDescriptor.java       |   10 +-
 .../db/streaming/CassandraStreamReceiver.java      |    3 +-
 .../cassandra/db/virtual/AccordDebugKeyspace.java  |   37 +-
 .../cassandra/exceptions/ExceptionSerializer.java  |   17 +-
 .../org/apache/cassandra/gms/FailureDetector.java  |   16 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |    2 +-
 .../org/apache/cassandra/journal/Compactor.java    |    7 +-
 .../apache/cassandra/journal/SegmentCompactor.java |    6 +-
 .../cassandra/repair/RepairMessageVerbHandler.java |   21 +
 .../org/apache/cassandra/repair/RepairSession.java |    9 +
 .../org/apache/cassandra/schema/TableParams.java   |    4 +-
 .../apache/cassandra/service/StorageService.java   |   11 +-
 .../service/accord/AccordCommandStore.java         |   20 +-
 .../cassandra/service/accord/AccordDataStore.java  |  148 +-
 .../service/accord/AccordFetchCoordinator.java     |   38 +-
 .../cassandra/service/accord/AccordKeyspace.java   |    6 +-
 .../service/accord/AccordMessageSink.java          |   27 +-
 .../cassandra/service/accord/AccordOperations.java |    6 +-
 .../service/accord/AccordResponseVerbHandler.java  |    6 +-
 .../cassandra/service/accord/AccordResult.java     |    4 +-
 .../cassandra/service/accord/AccordService.java    |  360 +++-
 .../service/accord/AccordVerbHandler.java          |    6 +-
 .../cassandra/service/accord/IAccordService.java   |   25 +-
 .../cassandra/service/accord/api/AccordAgent.java  |  136 +-
 .../service/accord/api/AccordTopologySorter.java   |   18 +-
 .../service/accord/api/AccordWaitStrategies.java   |   30 +-
 .../accord/api/CompositeTopologySorter.java        |   10 +-
 .../service/accord/debug/DebugExecution.java       |  193 +-
 .../service/accord/execution/AccordCache.java      |    6 +-
 .../service/accord/execution/AccordCacheEntry.java |   24 +-
 .../accord/execution/AccordCacheEntryQueue.java    |    8 +-
 .../service/accord/execution/AccordExecutor.java   |   91 +-
 .../service/accord/execution/CancelTask.java       |    9 +-
 .../accord/execution/ExclusiveExecutor.java        |   41 +-
 .../service/accord/execution/IOTaskLoad.java       |    2 +-
 .../service/accord/execution/IOTaskSave.java       |    2 +-
 .../service/accord/execution/IOTaskWrapper.java    |    2 +-
 .../cassandra/service/accord/execution/Plain.java  |   10 +-
 .../service/accord/execution/PlainChain.java       |    6 +-
 .../accord/execution/PlainChainDebuggable.java     |    4 +-
 .../service/accord/execution/PlainRunnable.java    |    6 +-
 .../service/accord/execution/SafeTask.java         |   73 +-
 .../cassandra/service/accord/execution/Task.java   |  201 ++-
 .../service/accord/execution/TaskQueueMulti.java   |   67 +-
 .../service/accord/execution/Tranches.java         |   29 +-
 .../service/accord/execution/Unstoppable.java      |    1 +
 .../accord/interop/AccordInteropAdapter.java       |   26 +-
 .../accord/interop/AccordInteropExecution.java     |   22 +-
 .../accord/journal/AbstractSegmentCompactor.java   |   39 +-
 .../service/accord/journal/AccordJournal.java      |    4 +-
 .../service/accord/repair/AccordRepair.java        |    7 +-
 .../serializers/CommandStoreSerializers.java       |   13 +-
 .../accord/serializers/FetchSerializers.java       |   24 +-
 .../serializers/GetDurableBeforeSerializers.java   |    4 +-
 .../accord/topology/AccordEndpointInfos.java       |  254 +++
 ...dEndpointMapper.java => AccordEndpointMap.java} |   35 +-
 .../service/accord/topology/AccordFastPath.java    |  303 ----
 .../accord/topology/AccordFastPathCoordinator.java |  347 ----
 .../accord/topology/AccordNodeInfoCoordinator.java |  366 ++++
 .../service/accord/topology/AccordNodeInfos.java   |  787 +++++++++
 .../accord/topology/AccordStaleReplicas.java       |  167 --
 .../accord/topology/AccordSyncPropagator.java      |   23 +-
 .../service/accord/topology/AccordTopology.java    |   19 +-
 .../accord/topology/AccordTopologyService.java     |    4 +-
 .../service/accord/topology/EndpointMapping.java   |  214 ---
 .../cassandra/service/accord/txn/TxnRead.java      |    4 +-
 .../migration/ConsensusKeyMigrationState.java      |    2 +-
 .../cassandra/tcm/AbstractLocalProcessor.java      |    2 +-
 .../org/apache/cassandra/tcm/ClusterMetadata.java  |  122 +-
 .../cassandra/tcm/ClusterMetadataService.java      |   27 +-
 .../org/apache/cassandra/tcm/MetadataKeys.java     |    6 +-
 .../apache/cassandra/tcm/PaxosBackedProcessor.java |    2 +-
 .../cassandra/tcm/StubClusterMetadataService.java  |    6 +-
 .../org/apache/cassandra/tcm/Transformation.java   |   10 +-
 .../cassandra/tcm/compatibility/GossipHelper.java  |   12 +-
 .../org/apache/cassandra/tcm/log/LocalLog.java     |   20 +-
 .../apache/cassandra/tcm/membership/Directory.java |    2 +-
 .../cassandra/tcm/sequences/BootstrapAndJoin.java  |    3 +-
 ...rdFastPath.java => AccordChangeDownStatus.java} |   36 +-
 ...cordFastPath.java => AccordChangeNodeInfo.java} |   63 +-
 .../tcm/transformations/AccordMarkHardRemoved.java |    9 +-
 .../tcm/transformations/AccordMarkStale.java       |   11 +-
 ...rdMarkRejoining.java => AccordUnmarkStale.java} |   26 +-
 .../cassandra/tcm/transformations/Startup.java     |    2 +
 ...ck-dtest.xml => logback-dtest-info-rolling.xml} |   15 +-
 .../{logback-dtest-quiet.xml => logback-info.xml}  |    4 +-
 .../distributed/impl/AbstractCluster.java          |   12 +-
 .../cassandra/distributed/impl/Instance.java       |   44 +-
 .../cassandra/distributed/impl/InstanceConfig.java |    2 +
 .../distributed/test/ClearSnapshotTest.java        |    2 +-
 .../test/RepairParticipantShutdownTest.java        |   78 +
 .../test/accord/AccordIncrementalRepairTest.java   |   12 +-
 .../test/accord/AccordJournalIntegrationTest.java  |    6 +-
 .../distributed/test/accord/AccordLoadTest.java    |    5 +-
 .../test/accord/AccordNodetoolTest.java            |   10 +-
 .../AccordRecoverFromAvailabilityLossTest.java     |   16 +-
 .../test/accord/AccordRegainRangesTest.java        |    2 +-
 .../test/accord/AccordSimpleFastPathTest.java      |   10 +-
 .../distributed/test/accord/AccordTestBase.java    |   36 +-
 .../accord/journal/AccordJournalReplayTest.java    |    2 +-
 .../JournalAccessRouteIndexOnStartupRaceTest.java  |    8 +-
 .../accord/journal/StatefulJournalRestartTest.java |    6 +-
 .../test/log/ClusterMetadataTestHelper.java        |    9 +-
 .../test/tcm/RepairMetadataKeyspaceTest.java       |   17 +-
 .../fuzz/accord/load/AccordLoadTestBase.java       | 1857 ++++++++++++++++++++
 .../accord/load/AccordRebootstrapLoadTest.java     |   81 +
 .../fuzz/accord/load/AccordYcsbLoadTest.java       |  137 ++
 .../cassandra/fuzz/accord/load/LoadSettings.java   |  337 ++++
 .../cassandra/fuzz/topology/AccordBounceTest.java  |    4 +-
 ...HardCatchupTest.java => AccordCatchupTest.java} |    4 +-
 .../fuzz/topology/AccordRebootstrapTest.java       |    2 +-
 .../fuzz/topology/AccordTopologyMixupTest.java     |    8 +-
 .../topology/HarryOnAccordTopologyMixupTest.java   |    8 +-
 .../cassandra/fuzz/topology/JournalGCTest.java     |    1 +
 .../accord/journal/AccordJournalBurnTest.java      |   26 +-
 .../org/apache/cassandra/harry/ColumnSpec.java     |    4 +-
 .../org/apache/cassandra/harry/gen/Generators.java |    5 +-
 .../execution/AccordCommandStoreExecutorTest.java  |   63 +-
 .../simulator/test/AccordExecutorTest.java         |    2 +-
 .../config/DatabaseDescriptorRefTest.java          |   11 +-
 .../apache/cassandra/locator/MetaStrategyTest.java |    6 +-
 .../cassandra/service/accord/AccordAgentTest.java  |   50 +-
 .../service/accord/AccordDurabilityStallTest.java  |   10 +-
 ...ppingTest.java => AccordEndpointInfosTest.java} |    7 +-
 .../service/accord/AccordExpungeTest.java          |    2 +-
 .../service/accord/AccordFailedKeyTestHarness.java |    4 +-
 .../service/accord/AccordMessageSinkTest.java      |    7 +-
 .../service/accord/AccordNodeInfosTest.java        |  249 +++
 .../service/accord/AccordStaleReplicasTest.java    |   63 -
 .../cassandra/service/accord/AccordTestUtils.java  |   51 +-
 .../service/accord/AccordTopologyTest.java         |    8 +-
 .../service/accord/ControllableRangeIndex.java     |    2 +-
 .../cassandra/service/accord/EpochSyncTest.java    |   11 +-
 ...intMapper.java => SimpleAccordEndpointMap.java} |   10 +-
 .../accord/SimulatedAccordCommandStore.java        |    7 +
 .../accord/execution/AccordApplyFailureTest.java   |  407 +++++
 .../execution/AccordCacheEntryCycleTest.java       |    2 +-
 .../execution/AccordCacheEntryQueueTest.java       |    4 +-
 .../execution/AccordCacheEntryReentrancyTest.java  |    2 +-
 .../AccordCacheEntrySafeTaskCycleTest.java         |    2 +-
 .../accord/execution/AccordCacheEntryTest.java     |   10 +-
 .../service/accord/execution/AccordCacheTest.java  |    2 +-
 .../execution/AccordCommandFailureTestBase.java    |  763 ++++++++
 .../execution/AccordCommandStageFailureTest.java   |  252 +++
 .../accord/execution/AccordExecutionTestUtils.java |   12 +-
 .../AccordExecutorCancelledConsequenceTest.java    |    4 +-
 ...AccordExecutorContinuationCancellationTest.java |    4 +-
 .../execution/AccordExecutorIncrDeadlockTest.java  |    4 +-
 .../AccordExecutorIncrRequeueRevocationTest.java   |    4 +-
 .../execution/AccordExecutorKeyAdoptionTest.java   |    6 +-
 .../execution/AccordExecutorLoadFailureTest.java   |    6 +-
 .../execution/AccordExecutorLoopFailureTest.java   |    4 +-
 .../AccordExecutorPresetupLoadingTest.java         |    4 +-
 .../execution/AccordExecutorRangeScanTest.java     |    4 +-
 .../execution/AccordFailedKeyAbandonTest.java      |    6 +-
 .../accord/execution/AccordFailedKeyBatchTest.java |    6 +-
 .../accord/execution/AccordFailedKeyTest.java      |   32 +-
 .../service/accord/execution/CacheWedgeReport.java |  371 ++++
 .../accord/execution/QueueCycleDetector.java       |   67 +-
 .../accord/execution/TaskLifecycleTest.java        |    6 +-
 .../accord/execution/TaskQueueMultiBlendTest.java  |  159 ++
 .../serializers/CommandsForKeySerializerTest.java  |    2 +
 .../topology/AccordFastPathCoordinatorTest.java    |  258 ---
 .../topology/AccordNodeInfoCoordinatorTest.java    |  689 ++++++++
 .../accord/topology/AccordSyncPropagatorTest.java  |   20 +-
 .../tcm/ClusterMetadataSerializerTest.java         |   10 +-
 .../tcm/ClusterMetadataTransformationTest.java     |   22 +-
 ...joiningTest.java => AccordUnmarkStaleTest.java} |   12 +-
 .../apache/cassandra/tools/CMSOfflineToolTest.java |    6 +-
 .../cassandra/utils/CassandraGenerators.java       |   45 +-
 .../apache/cassandra/utils/NoSpamLoggerTest.java   |    2 +-
 .../cassandra/utils/concurrent/SignalLockTest.java |    2 +-
 176 files changed, 8890 insertions(+), 2531 deletions(-)
 create mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordEndpointInfos.java
 rename 
src/java/org/apache/cassandra/service/accord/topology/{AccordEndpointMapper.java
 => AccordEndpointMap.java} (65%)
 delete mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordFastPath.java
 delete mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordFastPathCoordinator.java
 create mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordNodeInfoCoordinator.java
 create mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordNodeInfos.java
 delete mode 100644 
src/java/org/apache/cassandra/service/accord/topology/AccordStaleReplicas.java
 delete mode 100644 
src/java/org/apache/cassandra/service/accord/topology/EndpointMapping.java
 copy 
src/java/org/apache/cassandra/tcm/transformations/{ReconfigureAccordFastPath.java
 => AccordChangeDownStatus.java} (64%)
 rename 
src/java/org/apache/cassandra/tcm/transformations/{ReconfigureAccordFastPath.java
 => AccordChangeNodeInfo.java} (55%)
 rename 
src/java/org/apache/cassandra/tcm/transformations/{AccordMarkRejoining.java => 
AccordUnmarkStale.java} (81%)
 copy test/conf/{logback-dtest.xml => logback-dtest-info-rolling.xml} (80%)
 copy test/conf/{logback-dtest-quiet.xml => logback-info.xml} (97%)
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/test/RepairParticipantShutdownTest.java
 create mode 100644 
test/distributed/org/apache/cassandra/fuzz/accord/load/AccordLoadTestBase.java
 create mode 100644 
test/distributed/org/apache/cassandra/fuzz/accord/load/AccordRebootstrapLoadTest.java
 create mode 100644 
test/distributed/org/apache/cassandra/fuzz/accord/load/AccordYcsbLoadTest.java
 create mode 100644 
test/distributed/org/apache/cassandra/fuzz/accord/load/LoadSettings.java
 rename 
test/distributed/org/apache/cassandra/fuzz/topology/{AccordHardCatchupTest.java 
=> AccordCatchupTest.java} (99%)
 rename test/unit/org/apache/cassandra/service/accord/{EndpointMappingTest.java 
=> AccordEndpointInfosTest.java} (82%)
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/AccordNodeInfosTest.java
 delete mode 100644 
test/unit/org/apache/cassandra/service/accord/AccordStaleReplicasTest.java
 rename 
test/unit/org/apache/cassandra/service/accord/{SimpleAccordEndpointMapper.java 
=> SimpleAccordEndpointMap.java} (91%)
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/execution/AccordApplyFailureTest.java
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/execution/AccordCommandFailureTestBase.java
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/execution/AccordCommandStageFailureTest.java
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/execution/CacheWedgeReport.java
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/execution/TaskQueueMultiBlendTest.java
 delete mode 100644 
test/unit/org/apache/cassandra/service/accord/topology/AccordFastPathCoordinatorTest.java
 create mode 100644 
test/unit/org/apache/cassandra/service/accord/topology/AccordNodeInfoCoordinatorTest.java
 rename 
test/unit/org/apache/cassandra/tcm/transformations/{AccordMarkRejoiningTest.java
 => AccordUnmarkStaleTest.java} (70%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to