Skip to content

[fix][broker] Fix NPE from the wrong iterator in the ownership cleanup job(ExtensibleLoadManagerImpl only) #24196

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
heesung-sohn merged 1 commit into from
Apr 22, 2025
Merged

[fix][broker] Fix NPE from the wrong iterator in the ownership cleanup job(ExtensibleLoadManagerImpl only) #24196

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
2 changes: 1 addition & 1 deletion .../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ private void doCleanup(String broker, boolean gracefully) {
// clean system bundles in the end
var orphanSystemServiceUnitIter = orphanSystemServiceUnits.entrySet().iterator();
while (orphanSystemServiceUnitIter.hasNext()) {
var orphanSystemServiceUnit = iter.next();
var orphanSystemServiceUnit = orphanSystemServiceUnitIter.next();
log.info("Overriding orphan system service unit:{}", orphanSystemServiceUnit.getKey());
overrideFutures.add(
overrideOwnership(orphanSystemServiceUnit.getKey(), orphanSystemServiceUnit.getValue(), broker,
Expand Down
20 changes: 20 additions & 0 deletions .../org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1897,6 +1897,26 @@ public void unloadTimeoutCheckTest()
TimeUnit.SECONDS).get(2, TimeUnit.SECONDS);
}

@Test(priority = 23)
public void testCleanSystemTopicOwnership()
throws Exception {
String topic = "persistent://pulsar/system/test-system-topic";
NamespaceBundle bundleName = pulsar.getNamespaceService().getBundle(TopicName.get(topic));
var releasing = new ServiceUnitStateData(Releasing, pulsar2.getBrokerId(), pulsar1.getBrokerId(), 1);
doReturn(CompletableFuture.completedFuture(Optional.of(brokerId1)))
.when(loadManager).selectAsync(any(), any(), any());

try {
disableChannels();
overrideTableView(channel1, bundleName.toString(), releasing);
} finally {
enableChannels();
}

channel1.cleanOwnerships();
channel2.cleanOwnerships();
}


private static ConcurrentHashMap<String, CompletableFuture<Optional<String>>> getOwnerRequests(
ServiceUnitStateChannel channel) throws IllegalAccessException {
Expand Down