forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support enable WebSocket on Pulsar Proxy. (apache#8613)
### Motivation Support enable WebSocket on Pulsar Proxy. ### Verifying this change Integration tests added.
- Loading branch information
1 parent
a1cf30a
commit 19767c7
Showing
12 changed files
with
282 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
...ation/src/test/java/org/apache/pulsar/tests/integration/proxy/TestProxyWithWebSocket.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.pulsar.tests.integration.proxy; | ||
|
|
||
| import lombok.Cleanup; | ||
| import org.apache.pulsar.client.admin.PulsarAdmin; | ||
| import org.apache.pulsar.common.policies.data.TenantInfo; | ||
| import org.apache.pulsar.tests.integration.containers.CSContainer; | ||
| import org.apache.pulsar.tests.integration.containers.ProxyContainer; | ||
| import org.apache.pulsar.tests.integration.suites.PulsarTestSuite; | ||
| import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec; | ||
| import org.awaitility.Awaitility; | ||
| import org.eclipse.jetty.client.HttpClient; | ||
| import org.eclipse.jetty.websocket.api.Session; | ||
| import org.eclipse.jetty.websocket.api.WebSocketListener; | ||
| import org.eclipse.jetty.websocket.api.annotations.WebSocket; | ||
| import org.eclipse.jetty.websocket.client.WebSocketClient; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Queue; | ||
| import java.util.concurrent.ArrayBlockingQueue; | ||
| import java.util.concurrent.Future; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import static org.apache.pulsar.tests.integration.containers.PulsarContainer.CS_PORT; | ||
|
|
||
| /** | ||
| * Test cases for proxy. | ||
| */ | ||
| public class TestProxyWithWebSocket extends PulsarTestSuite { | ||
| private final static Logger log = LoggerFactory.getLogger(TestProxyWithWebSocket.class); | ||
|
|
||
| @Override | ||
| protected PulsarClusterSpec.PulsarClusterSpecBuilder beforeSetupCluster( | ||
| String clusterName, | ||
| PulsarClusterSpec.PulsarClusterSpecBuilder specBuilder) { | ||
| Map<String, String> envs = new HashMap<>(); | ||
| envs.put("webSocketServiceEnabled", "true"); | ||
| specBuilder.proxyEnvs(envs); | ||
| return super.beforeSetupCluster(clusterName, specBuilder); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWebSocket() throws Exception { | ||
|
|
||
| final String tenant = "proxy-test-" + randomName(10); | ||
| final String namespace = tenant + "/ns1"; | ||
|
|
||
| @Cleanup | ||
| PulsarAdmin admin = PulsarAdmin.builder() | ||
| .serviceHttpUrl(pulsarCluster.getHttpServiceUrl()) | ||
| .build(); | ||
|
|
||
| admin.tenants().createTenant(tenant, | ||
| new TenantInfo(Collections.emptySet(), Collections.singleton(pulsarCluster.getClusterName()))); | ||
|
|
||
| admin.namespaces().createNamespace(namespace, Collections.singleton(pulsarCluster.getClusterName())); | ||
|
|
||
| HttpClient httpClient = new HttpClient(); | ||
| WebSocketClient webSocketClient = new WebSocketClient(httpClient); | ||
| webSocketClient.start(); | ||
| MyWebSocket myWebSocket = new MyWebSocket(); | ||
| String webSocketUri = pulsarCluster.getProxy().getHttpServiceUrl().replaceFirst("http", "ws") | ||
| + "/ws/v2/producer/persistent/" + namespace + "/my-topic"; | ||
| Future<Session> sessionFuture = webSocketClient.connect(myWebSocket, | ||
| URI.create(webSocketUri)); | ||
| sessionFuture.get().getRemote().sendString("{\n" + | ||
| " \"payload\": \"SGVsbG8gV29ybGQ=\",\n" + | ||
| " \"properties\": {\"key1\": \"value1\", \"key2\": \"value2\"},\n" + | ||
| " \"context\": \"1\"\n" + | ||
| "}"); | ||
|
|
||
| Awaitility.await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> { | ||
| String response = myWebSocket.getResponse(); | ||
| Assert.assertNotNull(response); | ||
| Assert.assertTrue(response.contains("ok")); | ||
| }); | ||
| } | ||
|
|
||
| @WebSocket | ||
| public static class MyWebSocket implements WebSocketListener { | ||
| Queue<String> incomingMessages = new ArrayBlockingQueue<>(10); | ||
| @Override | ||
| public void onWebSocketBinary(byte[] bytes, int i, int i1) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onWebSocketText(String s) { | ||
| incomingMessages.add(s); | ||
| } | ||
|
|
||
| @Override | ||
| public void onWebSocketClose(int i, String s) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onWebSocketConnect(Session session) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void onWebSocketError(Throwable throwable) { | ||
|
|
||
| } | ||
|
|
||
| public String getResponse() { | ||
| return incomingMessages.poll(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
tests/integration/src/test/resources/pulsar-proxy-websocket.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" > | ||
| <suite name="Pulsar (Proxy with WebSocket) Integration Tests" verbose="2" annotations="JDK"> | ||
| <test name="messaging-test-suite" preserve-order="true"> | ||
| <classes> | ||
| <class name="org.apache.pulsar.tests.integration.proxy.TestProxyWithWebSocket" /> | ||
| </classes> | ||
| </test> | ||
| </suite> |
Oops, something went wrong.