Skip to content

[ISSUE #162] fix sync stopped when upgrade 0.2.6 from 0.2.2 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2022
Merged

[ISSUE #162] fix sync stopped when upgrade 0.2.6 from 0.2.2 #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,11 @@ private void sendBatchAppendEntryRequest() throws Exception {
switch (responseCode) {
case SUCCESS:
batchPendingMap.remove(x.getIndex());
updatePeerWaterMark(x.getTerm(), peerId, x.getIndex() + x.getCount() - 1);
if (x.getCount() == 0) {
updatePeerWaterMark(x.getTerm(), peerId, x.getIndex());
} else {
updatePeerWaterMark(x.getTerm(), peerId, x.getIndex() + x.getCount() - 1);
}
break;
case INCONSISTENT_STATE:
logger.info("[Push-{}]Get INCONSISTENT_STATE when batch push index={} term={}", peerId, x.getIndex(), x.getTerm());
Expand Down Expand Up @@ -629,10 +633,10 @@ private void doBatchAppendInner(long index) throws Exception {

private void doCheckBatchAppendResponse() throws Exception {
long peerWaterMark = getPeerWaterMark(term, peerId);
Pair pair = batchPendingMap.get(peerWaterMark + 1);
if (pair != null && System.currentTimeMillis() - (long) pair.getKey() > dLedgerConfig.getMaxPushTimeOutMs()) {
Pair<Long, Integer> pair = batchPendingMap.get(peerWaterMark + 1);
if (pair != null && System.currentTimeMillis() - pair.getKey() > dLedgerConfig.getMaxPushTimeOutMs()) {
long firstIndex = peerWaterMark + 1;
long lastIndex = firstIndex + (int) pair.getValue() - 1;
long lastIndex = firstIndex + pair.getValue() - 1;
logger.warn("[Push-{}]Retry to push entry from {} to {}", peerId, firstIndex, lastIndex);
batchAppendEntryRequest.clear();
for (long i = firstIndex; i <= lastIndex; i++) {
Expand Down