Skip to content

fix(zerozone2): gracefully await subscriber close #2895

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

fix(zerozone2): gracefully await subscriber close #2895

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: 6 additions & 6 deletions core/src/main/java/kafka/automq/zerozone/SnapshotReadPartitionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
Expand All @@ -83,6 +84,7 @@ public class SnapshotReadPartitionsManager implements MetadataListener, ProxyTop
final EventLoop eventLoop = new EventLoop("AUTOMQ_SNAPSHOT_READ_WORKER");
private AutoMQVersion version;
private volatile boolean closed = false;
private final List<CompletableFuture<Void>> closingSubscribers = new CopyOnWriteArrayList<>();

public SnapshotReadPartitionsManager(KafkaConfig config, Metrics metrics, Time time,
ConfirmWALProvider confirmWALProvider,
Expand Down Expand Up @@ -111,12 +113,8 @@ public SnapshotReadPartitionsManager(KafkaConfig config, Metrics metrics, Time t

public synchronized void close() {
closed = true;
CompletableFuture.allOf(
subscribers.values().stream()
.map(Subscriber::close)
.toList()
.toArray(new CompletableFuture<?>[0])
).join();
subscribers.forEach((k, s) -> s.close());
CompletableFuture.allOf(closingSubscribers.toArray(new CompletableFuture[0])).join();
subscribers.clear();
}

Expand Down Expand Up @@ -307,6 +305,8 @@ public CompletableFuture<Void> nextSnapshotCf() {
public CompletableFuture<Void> close() {
LOGGER.info("[SNAPSHOT_READ_UNSUBSCRIBE],node={}", node);
CompletableFuture<Void> cf = new CompletableFuture<>();
closingSubscribers.add(cf);
cf.whenComplete((nil, ex) -> closingSubscribers.remove(cf));
eventLoop.execute(() -> {
try {
closed = true;
Expand Down
Loading