This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 73d8ee1a71 Bump the correct metric when doing progress barrier retries
73d8ee1a71 is described below
commit 73d8ee1a7114d96e879ea3e968e7dd03b830d221
Author: Marcus Eriksson <[email protected]>
AuthorDate: Tue Oct 1 15:29:06 2024 +0200
Bump the correct metric when doing progress barrier retries
Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-20016
---
.../apache/cassandra/config/CassandraRelevantProperties.java | 10 ----------
.../org/apache/cassandra/tcm/sequences/ProgressBarrier.java | 3 +--
.../apache/cassandra/tcm/sequences/ProgressBarrierTest.java | 3 +++
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git
a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index fcf9f7d0e6..9862f22782 100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -529,16 +529,6 @@ public enum CassandraRelevantProperties
// but it makes sense to group logically related properties together
TCM_ALLOW_TRANSFORMATIONS_DURING_UPGRADES("cassandra.allow_transformations_during_upgrades",
"false"),
- /**
- * for obtaining acknowlegement from peers to make progress in multi-step
operations
- */
-
TCM_PROGRESS_BARRIER_BACKOFF_MILLIS("cassandra.progress_barrier_backoff_ms",
"1000"),
-
TCM_PROGRESS_BARRIER_TIMEOUT_MILLIS("cassandra.progress_barrier_timeout_ms",
"3600000"),
- /**
- * size of in-memory index of max epoch -> sealed period
- */
-
TCM_RECENTLY_SEALED_PERIOD_INDEX_SIZE("cassandra.recently_sealed_period_index_size",
"10"),
-
/**
* for testing purposes disable the automatic CMS reconfiguration after a
bootstrap/replace/move operation
*/
diff --git a/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java
b/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java
index 28f94cacf8..af504d35d3 100644
--- a/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java
+++ b/src/java/org/apache/cassandra/tcm/sequences/ProgressBarrier.java
@@ -198,7 +198,7 @@ public class ProgressBarrier
Retry.Deadline deadline =
Retry.Deadline.after(TimeUnit.MILLISECONDS.toNanos(TIMEOUT_MILLIS),
new
Retry.Backoff(DatabaseDescriptor.getCmsDefaultRetryMaxTries(),
(int)
BACKOFF_MILLIS,
-
TCMMetrics.instance.fetchLogRetries));
+
TCMMetrics.instance.progressBarrierRetries));
while (!deadline.reachedMax())
{
for (WatermarkRequest request : requests)
@@ -523,7 +523,6 @@ public class ProgressBarrier
public WatermarkRequest(InetAddressAndPort to, MessageDelivery
messagingService, Epoch waitFor)
{
-
this.to = to;
this.messagingService = messagingService;
this.waitFor = waitFor;
diff --git
a/test/unit/org/apache/cassandra/tcm/sequences/ProgressBarrierTest.java
b/test/unit/org/apache/cassandra/tcm/sequences/ProgressBarrierTest.java
index c5bf2c129b..91bd26d479 100644
--- a/test/unit/org/apache/cassandra/tcm/sequences/ProgressBarrierTest.java
+++ b/test/unit/org/apache/cassandra/tcm/sequences/ProgressBarrierTest.java
@@ -45,6 +45,7 @@ import org.apache.cassandra.harry.gen.rng.PcgRSUFast;
import org.apache.cassandra.harry.gen.rng.RngUtils;
import org.apache.cassandra.harry.sut.TokenPlacementModel;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.metrics.TCMMetrics;
import org.apache.cassandra.net.ConnectionType;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessageDelivery;
@@ -320,7 +321,9 @@ public class ProgressBarrierTest extends CMSTestBase
.advance(metadata.epoch)
.barrier()
.withMessagingService(delivery);
+ long before =
TCMMetrics.instance.progressBarrierRetries.getCount();
progressBarrier.await();
+
Assert.assertTrue(TCMMetrics.instance.progressBarrierRetries.getCount() -
before > 0);
Assert.assertTrue(responded.size() == 1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
