Skip to content
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

Jump to bottom

Fix autoRecover memory leak. #3361

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Fix autoRecover memory leak. #3361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd2d4e
fix auto recovery memory leak problem.
horizonzy Jun 25, 2022
5ec39a4
address comment.
horizonzy Jun 27, 2022
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
42 changes: 42 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.bookkeeper.versioning.LongVersion;
import org.apache.bookkeeper.versioning.Version;
import org.apache.bookkeeper.versioning.Versioned;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.AsyncCallback.DataCallback;
import org.apache.zookeeper.AsyncCallback.StatCallback;
Expand Down Expand Up @@ -154,6 +155,30 @@ private void handleMetadata(Versioned<LedgerMetadata> result, Throwable exceptio
}
}

/**
* CancelWatchLedgerMetadataTask class.
*/
protected class CancelWatchLedgerMetadataTask implements Runnable {

final long ledgerId;

CancelWatchLedgerMetadataTask(long ledgerId) {
this.ledgerId = ledgerId;
}

@Override
public void run() {
Set<LedgerMetadataListener> listeners = AbstractZkLedgerManager.this.listeners.get(ledgerId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is running in the same thread of "unregisterLedgerMetadataListener"

why do you need a inner class ? can't we simply code this as a regular Java method ?

private void cancelLedgerWatchers(long ledgerId) {
.... 
}

and call it from unregisterLedgerMetadataListener ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow the origin code style. See ReadLedgerMetadataTask.

if (!CollectionUtils.isEmpty(listeners)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Still watch ledgerId: {}, ignore this unwatch task.", ledgerId);
}
return;
}
cancelMetadataWatch(ledgerId, AbstractZkLedgerManager.this);
}
}

/**
* ZooKeeper-based Ledger Manager Constructor.
*
Expand Down Expand Up @@ -420,11 +445,28 @@ public void unregisterLedgerMetadataListener(long ledgerId, LedgerMetadataListen
}
if (listenerSet.isEmpty()) {
listeners.remove(ledgerId, listenerSet);
new CancelWatchLedgerMetadataTask(ledgerId).run();
}
}
}
}

private void cancelMetadataWatch(long ledgerId, Watcher watcher) {
zk.removeWatches(getLedgerPath(ledgerId), watcher, WatcherType.Data, true, new VoidCallback() {
@Override
public void processResult(int rc, String path, Object o) {
if (rc != KeeperException.Code.OK.intValue()) {
LOG.error("Cancel watch ledger {} metadata failed.", ledgerId,
KeeperException.create(KeeperException.Code.get(rc), path));
return;
}
if (LOG.isDebugEnabled()) {
LOG.debug("Cancel watch ledger {} metadata succeed.", ledgerId);
}
}
}, null);
}

@Override
public CompletableFuture<Versioned<LedgerMetadata>> readLedgerMetadata(long ledgerId) {
return readLedgerMetadata(ledgerId, null);
Expand Down
7 changes: 7 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,9 +824,16 @@ public void testUnregisterLedgerMetadataListener() throws Exception {
ledgerStr, true,
KeeperException.Code.OK.intValue(), serDe.serialize(metadata), stat);

mockZkRemoveWatcher();

// unregister the listener
ledgerManager.unregisterLedgerMetadataListener(ledgerId, listener);
assertFalse(ledgerManager.listeners.containsKey(ledgerId));
assertFalse(watchers.containsKey(ledgerStr));
verify(mockZk, times(1)).removeWatches(eq(ledgerManager.getLedgerPath(ledgerId)),
any(Watcher.class), any(Watcher.WatcherType.class), any(Boolean.class),
any(VoidCallback.class), any());


// notify the watcher event
notifyWatchedEvent(
Expand Down
32 changes: 32 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/MockZooKeeperTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.zookeeper.AsyncCallback.StringCallback;
import org.apache.zookeeper.AsyncCallback.VoidCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.EventType;
Expand Down Expand Up @@ -83,6 +84,20 @@ private void addWatcher(String path, Watcher watcher) {
watcherSet.add(watcher);
}

private void removeWatcher(String path, Watcher watcher) {
if (watcher == null) {
return;
}
Set<Watcher> watcherSet = watchers.get(path);
if (null == watcherSet) {
return;
}
watcherSet.remove(watcher);
if (watcherSet.isEmpty()) {
watchers.remove(path);
}
}

protected void mockZkUtilsAsyncCreateFullPathOptimistic(
String expectedLedgerPath,
CreateMode expectedCreateMode,
Expand Down Expand Up @@ -187,7 +202,24 @@ protected void mockZkGetData(
expectedWatcher ? any(Watcher.class) : eq(null),
any(DataCallback.class),
any());
}

protected void mockZkRemoveWatcher () throws Exception {
doAnswer(invocationOnMock -> {
String path = invocationOnMock.getArgument(0);
Watcher watcher = invocationOnMock.getArgument(1);
VoidCallback callback = invocationOnMock.getArgument(4);
removeWatcher(path, watcher);

callback.processResult(KeeperException.Code.OK.intValue(), path, null);
return null;
}).when(mockZk).removeWatches(
any(String.class),
any(Watcher.class),
any(Watcher.WatcherType.class),
any(Boolean.class),
any(VoidCallback.class),
any());
}

protected void mockZkSetData(
Expand Down