1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
Description: reasonably raising some time limits in tests
The default time limits may be too low for some machines
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2022-06-29
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/RequestPathMetricsCollectorTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/RequestPathMetricsCollectorTest.java
@@ -440,12 +440,12 @@
() -> requestPathMetricsCollector.registerRequest(getChildren, "/path1/path2/path" + rand.nextInt(10)));
}
executor.shutdown();
- //wait for at most 10 mill seconds
- executor.awaitTermination(10, TimeUnit.MILLISECONDS);
+ //wait for at most 100 mill seconds
+ executor.awaitTermination(100, TimeUnit.MILLISECONDS);
assertTrue(executor.isTerminated());
Long endTime = System.currentTimeMillis();
- //less than 2 seconds total time
- assertTrue(TimeUnit.MILLISECONDS.toSeconds(endTime - startTime) < 3);
+ //less than 10 seconds total time
+ assertTrue(TimeUnit.MILLISECONDS.toSeconds(endTime - startTime) < 10);
}
}
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketModeDetectionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketModeDetectionTest.java
@@ -149,7 +149,7 @@
forceClose(serverSideSocket);
forceClose(clientSocket);
workerPool.shutdown();
- workerPool.awaitTermination(1000, TimeUnit.MILLISECONDS);
+ workerPool.awaitTermination(2000, TimeUnit.MILLISECONDS);
x509Util.close();
}
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketTest.java
@@ -190,7 +190,7 @@
public void shutdown(long millis) throws InterruptedException {
forceClose(serverSocket); // this should break the run() loop
- workerPool.awaitTermination(millis, TimeUnit.MILLISECONDS);
+ workerPool.awaitTermination(2L * millis, TimeUnit.MILLISECONDS);
this.join(millis);
}
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java
@@ -219,7 +219,7 @@
// Servers have been set up. Now go test if secure connection is successful.
for (int i = 0; i < SERVER_COUNT; i++) {
- assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[i], TIMEOUT),
+ assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[i], 10L * TIMEOUT),
"waiting for server " + i + " being up");
final int port = useSecurePort ? secureClientPorts[i] : clientPorts[i];
try (ZooKeeper zk = ClientBase.createZKClient(hostname + ":" + port, TIMEOUT, connectTimeout)) {
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ClientSSLReloadTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ClientSSLReloadTest.java
@@ -147,7 +147,7 @@
}
}, zKClientConfig)) {
assertTrue(zk.getClientConfig().getBoolean(ZKClientConfig.SECURE_CLIENT));
- assertTrue(l.await(10, TimeUnit.SECONDS));
+ assertTrue(l.await(60, TimeUnit.SECONDS));
}
Log.info("Updating keyStore & trustStore files !!!!");
|
