Skip to content

Commit baa8f18

Browse files
committed
Improve Tracing
- Introduce pattern tracing, that can intercept failed or new coordinations matching various filters - Support additional tracing event collection modes (SAMPLE and RING) patch by Benedict; reviewed by Alex Petrov for CASSANDRA-20911
1 parent b712cfb commit baa8f18

File tree

12 files changed

+1528
-295
lines changed

12 files changed

+1528
-295
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "modules/accord"]
22
path = modules/accord
3-
url = https://github.com/apache/cassandra-accord.git
4-
branch = trunk
3+
url = https://github.com/belliottsmith/cassandra-accord.git
4+
branch = improve-tracing

modules/accord

Submodule accord updated 52 files

src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java

Lines changed: 474 additions & 87 deletions
Large diffs are not rendered by default.

src/java/org/apache/cassandra/metrics/AccordCoordinatorMetrics.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ public String toString()
198198

199199
public static class Listener implements CoordinatorEventListener
200200
{
201-
public static final Listener instance = new Listener();
202-
203201
private AccordCoordinatorMetrics forTransaction(TxnId txnId)
204202
{
205203
if (txnId != null)

src/java/org/apache/cassandra/metrics/AccordReplicaMetrics.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ public String toString()
112112

113113
public static class Listener implements ReplicaEventListener
114114
{
115-
public static final Listener instance = new Listener();
116-
117115
private AccordReplicaMetrics forTransaction(TxnId txnId)
118116
{
119117
if (txnId != null)

src/java/org/apache/cassandra/metrics/AccordSystemMetrics.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ static class SnapshotBuilder
132132
}
133133
}
134134

135+
public static void touch()
136+
{
137+
}
138+
135139
private AccordSystemMetrics()
136140
{
137141
Invariants.expect(AccordService.isSetup());

src/java/org/apache/cassandra/service/accord/AccordService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import accord.api.ConfigurationService.EpochReady;
4242
import accord.primitives.Txn;
4343
import org.apache.cassandra.metrics.AccordReplicaMetrics;
44+
import org.apache.cassandra.metrics.AccordSystemMetrics;
4445
import org.apache.cassandra.service.accord.api.AccordViolationHandler;
4546
import org.apache.cassandra.utils.Clock;
4647
import org.apache.cassandra.utils.concurrent.AsyncFuture;
@@ -307,6 +308,7 @@ public synchronized static AccordService startup(NodeId tcmId)
307308
instance = as;
308309

309310
AccordReplicaMetrics.touch();
311+
AccordSystemMetrics.touch();
310312
AccordViolationHandler.setup();
311313

312314
WatermarkCollector.fetchAndReportWatermarksAsync(as.configService);

0 commit comments

Comments
 (0)