Skip to content

Commit adc5ae9

Browse files
committed
pass max_seq_no_of_updates
1 parent 9635997 commit adc5ae9

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTask.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class ShardFollowNodeTask extends AllocatedPersistentTask {
5757

5858
private long leaderGlobalCheckpoint;
5959
private long leaderMaxSeqNo;
60-
private volatile long leaderMaxSeqNoOfUpdatesOrDeletes = SequenceNumbers.UNASSIGNED_SEQ_NO;
60+
private long leaderMaxSeqNoOfUpdatesOrDeletes = SequenceNumbers.UNASSIGNED_SEQ_NO;
6161
private long lastRequestedSeqNo;
6262
private long followerGlobalCheckpoint = 0;
6363
private long followerMaxSeqNo = 0;
@@ -203,7 +203,7 @@ private synchronized void coordinateWrites() {
203203
numConcurrentWrites++;
204204
LOGGER.trace("{}[{}] write [{}/{}] [{}]", params.getFollowShardId(), numConcurrentWrites, ops.get(0).seqNo(),
205205
ops.get(ops.size() - 1).seqNo(), ops.size());
206-
sendBulkShardOperationsRequest(ops);
206+
sendBulkShardOperationsRequest(ops, leaderMaxSeqNoOfUpdatesOrDeletes, new AtomicInteger(0));
207207
}
208208
}
209209

@@ -294,11 +294,8 @@ synchronized void innerHandleReadResponse(long from, long maxRequiredSeqNo, Shar
294294
}
295295
}
296296

297-
private void sendBulkShardOperationsRequest(List<Translog.Operation> operations) {
298-
sendBulkShardOperationsRequest(operations, new AtomicInteger(0));
299-
}
300-
301-
private void sendBulkShardOperationsRequest(List<Translog.Operation> operations, AtomicInteger retryCounter) {
297+
private void sendBulkShardOperationsRequest(List<Translog.Operation> operations, long leaderMaxSeqNoOfUpdatesOrDeletes,
298+
AtomicInteger retryCounter) {
302299
assert leaderMaxSeqNoOfUpdatesOrDeletes != SequenceNumbers.UNASSIGNED_SEQ_NO : "mus is not replicated";
303300
final long startTime = relativeTimeProvider.getAsLong();
304301
innerSendBulkShardOperationsRequest(operations, leaderMaxSeqNoOfUpdatesOrDeletes,
@@ -315,7 +312,8 @@ private void sendBulkShardOperationsRequest(List<Translog.Operation> operations,
315312
totalIndexTimeMillis += TimeUnit.NANOSECONDS.toMillis(relativeTimeProvider.getAsLong() - startTime);
316313
numberOfFailedBulkOperations++;
317314
}
318-
handleFailure(e, retryCounter, () -> sendBulkShardOperationsRequest(operations, retryCounter));
315+
handleFailure(e, retryCounter,
316+
() -> sendBulkShardOperationsRequest(operations, leaderMaxSeqNoOfUpdatesOrDeletes, retryCounter));
319317
}
320318
);
321319
}

0 commit comments

Comments
 (0)