review feedback

apache · Apr 23, 2024 · c085d4e · c085d4e
1 parent 0e630ba
commit c085d4e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/modules/accord b/modules/accord
diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java
@@ -147,15 +147,17 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
     /**
      * Create new repair session.
      *
-     * @param parentRepairSession the parent sessions id
-     * @param commonRange         ranges to repair
-     * @param excludedDeadNodes   Was the repair started for --force and were dead nodes excluded as a result
-     * @param keyspace            name of keyspace
-     * @param parallelismDegree   specifies the degree of parallelism when calculating the merkle trees
-     * @param pullRepair          true if the repair should be one way (from remote host to this host and only applicable between two hosts--see RepairOption)
-     * @param repairPaxos         true if incomplete paxos operations should be completed as part of repair
-     * @param paxosOnly           true if we should only complete paxos operations, not run a normal repair
-     * @param cfnames             names of columnfamilies
+     * @param parentRepairSession  the parent sessions id
+     * @param commonRange          ranges to repair
+     * @param excludedDeadNodes    Was the repair started for --force and were dead nodes excluded as a result
+     * @param keyspace             name of keyspace
+     * @param parallelismDegree    specifies the degree of parallelism when calculating the merkle trees
+     * @param pullRepair           true if the repair should be one way (from remote host to this host and only applicable between two hosts--see RepairOption)
+     * @param repairPaxos          true if incomplete paxos operations should be completed as part of repair
+     * @param paxosOnly            true if we should only complete paxos operations, not run a normal repair
+     * @param accordOnly           true if we should only complete accord operations, not run a normal repair
+     * @param isConsensusMigration true if this repair is being run by the consensus migration tool (affects accord repair availability requirements)
+     * @param cfnames              names of columnfamilies
      */
     public RepairSession(SharedContext ctx,
                          Scheduler validationScheduler,
@@ -170,7 +172,8 @@ public RepairSession(SharedContext ctx,
                          boolean optimiseStreams,
                          boolean repairPaxos,
                          boolean paxosOnly,
-                         boolean accordOnly, boolean isConsensusMigration,
+                         boolean accordOnly,
+                         boolean isConsensusMigration,
                          String... cfnames)
     {
         this.ctx = ctx;

diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java b/src/java/org/apache/cassandra/service/accord/AccordService.java
@@ -366,7 +366,7 @@ public IVerbHandler<? extends Request> verbHandler()
             logger.debug("Starting barrier key: {} epoch: {} barrierType: {} isForWrite {}", keysOrRanges, epoch, barrierType, isForWrite);
             txnId = node.nextTxnId(Kind.SyncPoint, keysOrRanges.domain());
             AsyncResult<Timestamp> asyncResult = syncPoint == null
-                                                 ? node.barrier(keysOrRanges, epoch, barrierType)
+                                                 ? Barrier.barrier(node, keysOrRanges, epoch, barrierType)
                                                  : Barrier.barrier(node, keysOrRanges, epoch, barrierType, syncPoint);
             long deadlineNanos = queryStartNanos + timeoutNanos;
             Timestamp barrierExecuteAt = AsyncChains.getBlocking(asyncResult, deadlineNanos - nanoTime(), NANOSECONDS);