Skip to content

Avoid race while mocking compactor #7102

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
merlimat merged 1 commit into from
May 31, 2020
Merged

Avoid race while mocking compactor #7102

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
15 changes: 8 additions & 7 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,15 +932,16 @@ protected synchronized ScheduledExecutorService getCompactorExecutor() {
return this.compactorExecutor;
}

// only public so mockito can mock it
public Compactor newCompactor() throws PulsarServerException {
return new TwoPhaseCompactor(this.getConfiguration(),
getClient(), getBookKeeperClient(),
getCompactorExecutor());
}

public synchronized Compactor getCompactor() throws PulsarServerException {
if (this.compactor == null) {
try {
this.compactor = new TwoPhaseCompactor(this.getConfiguration(),
getClient(), getBookKeeperClient(),
getCompactorExecutor());
} catch (Exception e) {
throw new PulsarServerException(e);
}
this.compactor = newCompactor();
}
return this.compactor;
}
Expand Down
8 changes: 5 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.pulsar.broker.auth;

import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;

Expand Down Expand Up @@ -246,9 +247,6 @@ protected PulsarService startBroker(ServiceConfiguration conf) throws Exception
pulsar.start();
conf.setAuthorizationEnabled(isAuthorizationEnabled);

Compactor spiedCompactor = spy(pulsar.getCompactor());
doReturn(spiedCompactor).when(pulsar).getCompactor();

return pulsar;
}

Expand All @@ -261,6 +259,10 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider();

doReturn(sameThreadOrderedSafeExecutor).when(pulsar).getOrderedExecutor();

doAnswer((invocation) -> {
return spy(invocation.callRealMethod());
}).when(pulsar).newCompactor();
}

public TenantInfo createDefaultTenantInfo() throws PulsarAdminException {
Expand Down