Skip to content

Commit 4fd27ac

Browse files
committed
diagnose cov failure
1 parent 35894c7 commit 4fd27ac

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorer.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,15 @@ public CompletableFuture<Void> restoreFrom(String leader, KVRangeSnapshot rangeS
7373
CompletableFuture<Void> onDone = session.doneFuture;
7474
try {
7575
IKVReseter restorer = range.toReseter(rangeSnapshot);
76-
log.info("Restoring from snapshot: session={}, leader={} \n{}", session.id, leader, rangeSnapshot);
76+
log.info("Restoring from snapshot: session={}, leader={}, restorer={} \n{}",
77+
session.id, leader, restorer, rangeSnapshot);
7778
DisposableObserver<KVRangeMessage> observer = messenger.receive()
7879
.filter(m -> m.hasSaveSnapshotDataRequest()
7980
&& m.getSaveSnapshotDataRequest().getSessionId().equals(session.id))
8081
.timeout(idleTimeSec, TimeUnit.SECONDS)
8182
.observeOn(Schedulers.from(executor))
8283
.subscribeWith(new DisposableObserver<KVRangeMessage>() {
84+
private final IKVReseter reseter = restorer;
8385
@Override
8486
public void onNext(@NonNull KVRangeMessage m) {
8587
SaveSnapshotDataRequest request = m.getSaveSnapshotDataRequest();
@@ -90,19 +92,19 @@ public void onNext(@NonNull KVRangeMessage m) {
9092
for (KVPair kv : request.getKvList()) {
9193
bytes += kv.getKey().size();
9294
bytes += kv.getValue().size();
93-
restorer.put(kv.getKey(), kv.getValue());
95+
reseter.put(kv.getKey(), kv.getValue());
9496
}
9597
metricManager.reportRestore(bytes);
9698
log.debug("Saved {} bytes snapshot data, send reply to {}: session={}",
9799
bytes, m.getHostStoreId(), session.id);
98100
if (request.getFlag() == SaveSnapshotDataRequest.Flag.End) {
99101
if (!onDone.isCancelled()) {
100-
restorer.done();
102+
reseter.done();
101103
dispose();
102104
onDone.complete(null);
103105
log.info("Restored from snapshot: session={}", session.id);
104106
} else {
105-
restorer.abort();
107+
reseter.abort();
106108
dispose();
107109
log.info("Snapshot restore canceled: session={}", session.id);
108110
}
@@ -136,8 +138,8 @@ public void onNext(@NonNull KVRangeMessage m) {
136138

137139
@Override
138140
public void onError(@NonNull Throwable e) {
139-
if (restorer != null) {
140-
restorer.abort();
141+
if (reseter != null) {
142+
reseter.abort();
141143
} else {
142144
log.error("restorer is null", e);
143145
}

0 commit comments

Comments
 (0)