Skip to content

[Websocket] Websocket doesn't set the correct cluster data #6102

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
sijie merged 4 commits into from
Jan 24, 2020
Merged

[Websocket] Websocket doesn't set the correct cluster data #6102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b71951
[Functions] The argument and description for dead letter topic is wrong
sijie Jan 20, 2020
0e47906
[Websocket] Websocket doesn't set the correct cluster data
sijie Jan 21, 2020
bba788f
Merge remote-tracking branch 'apache/master' into fix_websocket_regre…
sijie Jan 21, 2020
adc9ccb
Check if webSocketService is set
sijie Jan 22, 2020
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
10 changes: 7 additions & 3 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 @@ -427,9 +427,7 @@ public Boolean get() {

if (config.isWebSocketServiceEnabled()) {
// Use local broker address to avoid different IP address when using a VIP for service discovery
this.webSocketService = new WebSocketService(
new ClusterData(webServiceAddress, webServiceAddressTls, brokerServiceUrl, brokerServiceUrlTls),
config);
this.webSocketService = new WebSocketService(null, config);
this.webSocketService.start();

final WebSocketServlet producerWebSocketServlet = new WebSocketProducerServlet(webSocketService);
Expand Down Expand Up @@ -466,6 +464,12 @@ public Boolean get() {
this.brokerServiceUrl = brokerUrl(config);
this.brokerServiceUrlTls = brokerUrlTls(config);

if (null != this.webSocketService) {
ClusterData clusterData =
new ClusterData(webServiceAddress, webServiceAddressTls, brokerServiceUrl, brokerServiceUrlTls);
this.webSocketService.setLocalCluster(clusterData);
}

// needs load management service
this.startNamespaceService();

Expand Down
2 changes: 2 additions & 0 deletions pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import javax.servlet.ServletException;
import javax.websocket.DeploymentException;

import lombok.Setter;
import org.apache.bookkeeper.common.util.OrderedScheduler;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.ServiceConfiguration;
Expand Down Expand Up @@ -77,6 +78,7 @@ public class WebSocketService implements Closeable {
private ServiceConfiguration config;
private ConfigurationCacheService configurationCacheService;

@Setter
private ClusterData localCluster;
private final ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<ProducerHandler>> topicProducerMap;
private final ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<ConsumerHandler>> topicConsumerMap;
Expand Down