Skip to content

fix(zerozone2): fix failover bug caused by #2764 #2781

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
Aug 25, 2025
Merged

fix(zerozone2): fix failover bug caused by #2764 #2781

Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/DefaultWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ public DefaultWriter(Time time, ObjectStorage objectStorage, ObjectWALConfig con
this.nodePrefix = ObjectUtils.nodePrefix(config.clusterId(), config.nodeId(), config.type());
this.objectPrefix = nodePrefix + config.epoch() + "/wal/";
this.scheduler = Threads.newSingleThreadScheduledExecutor("s3-wal-schedule", true, LOGGER);
if (!(config.openMode() == OpenMode.READ_WRITE || config.openMode() == OpenMode.FAILOVER)) {
throw new IllegalArgumentException("The open mode must be READ_WRITE or FAILOVER, but got " + config.openMode());
}
ObjectWALMetricsManager.setInflightUploadCountSupplier(() -> (long) uploadingBulks.size());
ObjectWALMetricsManager.setBufferedDataInBytesSupplier(bufferedDataBytes::get);
ObjectWALMetricsManager.setObjectDataInBytesSupplier(objectDataBytes::get);
Expand Down Expand Up @@ -213,10 +216,6 @@ protected void checkStatus() throws WALFencedException {
}

protected void checkWriteStatus() throws WALFencedException {
if (config.openMode() != OpenMode.READ_WRITE) {
throw new IllegalStateException("WAL is in failover mode.");
}

checkStatus();
}

Expand Down Expand Up @@ -420,7 +419,7 @@ private void callback() {
// The inflight uploading bulks count was decreased, then trigger the upload of Bulk in waitingUploadBulks
tryUploadBulkInWaiting();
long commitStartTime = time.nanoseconds();
return reservationService.verify(config.nodeId(), config.epoch(), false)
return reservationService.verify(config.nodeId(), config.epoch(), config.openMode() == OpenMode.FAILOVER)
.whenComplete((rst, ex) -> {
ObjectWALMetricsManager.recordOperationLatency(time.nanoseconds() - commitStartTime, "commit", ex == null);
if (ex != null) {
Expand Down
2 changes: 1 addition & 1 deletion s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/ObjectWALService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class ObjectWALService implements WriteAheadLog {
public ObjectWALService(Time time, ObjectStorage objectStorage, ObjectWALConfig config) {
this.objectStorage = objectStorage;
this.config = config;
if (config.openMode() == OpenMode.READ_WRITE) {
if (config.openMode() == OpenMode.READ_WRITE || config.openMode() == OpenMode.FAILOVER) {
this.writer = new DefaultWriter(time, objectStorage, config);
} else {
this.writer = new NoopWriter();
Expand Down
Loading