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

[INLONG-11711][SDK] SortSDK shares the same PulsarClient among different SortTasks to avoid performance bottlenecks caused by too many PulsarClients #11712

Merged
merged 5 commits into from
Feb 10, 2025
Merged

[INLONG-11711][SDK] SortSDK shares the same PulsarClient among different SortTasks to avoid performance bottlenecks caused by too many PulsarClients #11712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c41162
[INLONG-11711][SDK] SortSDK shares the same PulsarClient among differ…
luchunliang Jan 26, 2025
b155956
[INLONG-11711][SDK] SortSDK shares the same PulsarClient among differ…
luchunliang Jan 26, 2025
035482c
do not close pulsar client when a sort task exit
luchunliang Jan 27, 2025
2ea22d6
spotless
luchunliang Jan 27, 2025
f9834ae
Merge branch 'apache:master' into INLONG-11711
luchunliang Feb 8, 2025
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
4 changes: 2 additions & 2 deletions ...k/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/manager/InlongSingleTopicManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class InlongSingleTopicManager extends TopicManager {
private static final Logger LOGGER = LoggerFactory.getLogger(InlongSingleTopicManager.class);

private final ConcurrentHashMap<String, TopicFetcher> fetchers = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, PulsarClient> pulsarClients = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<String, PulsarClient> pulsarClients = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, TubeConsumerCreator> tubeFactories = new ConcurrentHashMap<>();

private final PeriodicTask updateMetaDataWorker;
Expand Down Expand Up @@ -199,7 +199,7 @@ public boolean clean() {
}

closeFetcher();
closePulsarClient();
// closePulsarClient();
closeTubeSessionFactory();
LOGGER.info("close finished {}", sortTaskId);
return true;
Expand Down
59 changes: 32 additions & 27 deletions inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/manager/InlongTopicManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class InlongTopicManager extends TopicManager {

private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
private final Map<String, TopicFetcher> fetchers = new ConcurrentHashMap<>();
private final Map<String, PulsarClient> pulsarClients = new ConcurrentHashMap<>();
private static final Map<String, PulsarClient> pulsarClients = new ConcurrentHashMap<>();
private final Map<String, TubeConsumerCreator> tubeFactories = new ConcurrentHashMap<>();

protected final ForkJoinPool pool;
Expand All @@ -88,7 +88,7 @@ public boolean clean() {
LOGGER.info("start to clean topic manager, sortTaskId={}", sortTaskId);
stopAssign = true;
closeAllFetchers();
closeAllPulsarClients();
// closeAllPulsarClients();
closeAllTubeFactories();
LOGGER.info("success to clean topic manager, sortTaskId={}", sortTaskId);
return true;
Expand Down Expand Up @@ -359,33 +359,38 @@ private void onlinePulsarClients() {

private void createPulsarClient(CacheZoneCluster cluster) {
LOGGER.info("start to init pulsar client for cluster={}", cluster);
if (cluster.getBootstraps() != null) {
try {
String token = cluster.getToken();
Authentication auth = null;
if (StringUtils.isNoneBlank(token)) {
auth = AuthenticationFactory.token(token);
}
PulsarClient pulsarClient = PulsarClient.builder()
.serviceUrl(cluster.getBootstraps())
.authentication(auth)
.build();
LOGGER.info("create pulsar client succ cluster:{}, token:{}",
cluster.getClusterId(),
cluster.getToken());
PulsarClient oldClient = pulsarClients.putIfAbsent(cluster.getClusterId(), pulsarClient);
if (oldClient != null && !oldClient.isClosed()) {
LOGGER.warn("close new pulsar client for cluster={}", cluster);
pulsarClient.close();
}
} catch (Exception e) {
LOGGER.error("create pulsar client error for cluster={}", cluster, e);
return;
}
LOGGER.info("success to init pulsar client for cluster={}", cluster);
} else {
String clientKey = cluster.getBootstraps();
if (clientKey == null) {
LOGGER.error("bootstrap is null for cluster={}", cluster);
return;
}
if (pulsarClients.containsKey(clientKey)) {
LOGGER.info("Repeat to init pulsar client for cluster={}", cluster);
return;
}
try {
String token = cluster.getToken();
Authentication auth = null;
if (StringUtils.isNoneBlank(token)) {
auth = AuthenticationFactory.token(token);
}
PulsarClient pulsarClient = PulsarClient.builder()
.serviceUrl(cluster.getBootstraps())
.authentication(auth)
.build();
LOGGER.info("create pulsar client succ cluster:{}, token:{}",
cluster.getClusterId(),
cluster.getToken());
PulsarClient oldClient = pulsarClients.putIfAbsent(cluster.getClusterId(), pulsarClient);
if (oldClient != null && !oldClient.isClosed()) {
LOGGER.warn("close new pulsar client for cluster={}", cluster);
pulsarClient.close();
}
} catch (Exception e) {
LOGGER.error("create pulsar client error for cluster={}", cluster, e);
return;
}
LOGGER.info("success to init pulsar client for cluster={}", cluster);
}

private List<CacheZoneCluster> getCacheZoneClusters(InlongTopicTypeEnum type) {
Expand Down
Loading