Skip to content

Commit 780685a

Browse files
committed
Bump remaining ZooKeeper test servers to 3.9 (curator 5.x needs server 3.6+)
Same root cause as the cluster e2e: the OAP's curator 5.9.0 client uses persistent watches (addWatch, ZooKeeper 3.6.0+), which a zookeeper:3.5 server rejects ("unknown type 106") -> ConnectionLoss. This made the Integration test suite hang (1h timeout, via the two zk testcontainer ITs) and the Virtual Gateway e2e fail (oap1 unhealthy). Bump the three remaining OAP-coordinator test servers zookeeper:3.5 -> 3.9: - ClusterModuleZookeeperProviderFunctionalIT (cluster-zookeeper-plugin) - ZookeeperConfigurationIT (configuration-zookeeper) - e2e cases/gateway/docker-compose.yml Validated locally on zk:3.9: both ITs pass (5 + 2 tests, no hang).
1 parent 7a73cb2 commit 780685a

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class ClusterModuleZookeeperProviderFunctionalIT {
6060

6161
@Container
6262
public final GenericContainer<?> container =
63-
new GenericContainer<>(DockerImageName.parse("zookeeper:3.5"))
63+
new GenericContainer<>(DockerImageName.parse("zookeeper:3.9"))
6464
.waitingFor(Wait.forLogMessage(".*binding to port.*", 1))
6565
.withExposedPorts(2181);
6666

oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ZookeeperConfigurationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class ZookeeperConfigurationIT {
5757

5858
@Container
5959
public final GenericContainer<?> container =
60-
new GenericContainer<>(DockerImageName.parse("zookeeper:3.5"))
60+
new GenericContainer<>(DockerImageName.parse("zookeeper:3.9"))
6161
.waitingFor(Wait.forLogMessage(".*binding to port.*", 1))
6262
.withExposedPorts(2181);
6363

test/e2e-v2/cases/gateway/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
services:
1717
zk:
18-
image: zookeeper:3.5
18+
image: zookeeper:3.9
1919
expose:
2020
- 2181
2121
networks:

0 commit comments

Comments
 (0)