Skip to content

[improve][broker] Remove ClassLoaderSwitcher to avoid objects allocations and consistent the codestyle #22796

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
dao-jun merged 1 commit into from
May 29, 2024
Merged

[improve][broker] Remove ClassLoaderSwitcher to avoid objects allocations and consistent the codestyle #22796

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
37 changes: 0 additions & 37 deletions pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ClassLoaderSwitcher.java
View file
Open in desktop

This file was deleted.

25 changes: 20 additions & 5 deletions ...in/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletWithClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.ClassLoaderSwitcher;
import org.apache.pulsar.common.configuration.PulsarConfiguration;
import org.apache.pulsar.common.nar.NarClassLoader;
import org.eclipse.jetty.servlet.ServletHolder;
Expand All @@ -40,29 +39,45 @@ public class AdditionalServletWithClassLoader implements AdditionalServlet {

@Override
public void loadConfig(PulsarConfiguration pulsarConfiguration) {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
servlet.loadConfig(pulsarConfiguration);
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public String getBasePath() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return servlet.getBasePath();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public ServletHolder getServletHolder() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return servlet.getServletHolder();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public void close() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
servlet.close();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
try {
classLoader.close();
Expand Down
44 changes: 35 additions & 9 deletions ...roker/src/main/java/org/apache/pulsar/broker/protocol/ProtocolHandlerWithClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.ClassLoaderSwitcher;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.service.BrokerService;
import org.apache.pulsar.common.nar.NarClassLoader;
Expand All @@ -44,52 +43,79 @@ class ProtocolHandlerWithClassLoader implements ProtocolHandler {

@Override
public String protocolName() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return handler.protocolName();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public boolean accept(String protocol) {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return handler.accept(protocol);
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public void initialize(ServiceConfiguration conf) throws Exception {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
handler.initialize(conf);
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public String getProtocolDataToAdvertise() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return handler.getProtocolDataToAdvertise();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public void start(BrokerService service) {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
handler.start(service);
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public Map<InetSocketAddress, ChannelInitializer<SocketChannel>> newChannelInitializers() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
return handler.newChannelInitializers();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}
}

@Override
public void close() {
try (ClassLoaderSwitcher ignored = new ClassLoaderSwitcher(classLoader)) {
ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(classLoader);
handler.close();
} finally {
Thread.currentThread().setContextClassLoader(prevClassLoader);
}

try {
classLoader.close();
} catch (IOException e) {
Expand Down