natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase block-until-connected in ZookeeperRegistryTestCase (#16041)

This commit is contained in:
Wenjun Ruan 2024-05-21 10:32:15 +08:00 committed by GitHub
parent b184364561
commit e4df01a033
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistry.java
View File

@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.registry.api.Registry;
import org.apache.dolphinscheduler.registry.api.RegistryException;
import org.apache.dolphinscheduler.registry.api.SubscribeListener;
import org.apache.commons.lang3.time.DurationUtils;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.api.ACLProvider;
@ -76,8 +77,8 @@ final class ZookeeperRegistry implements Registry {
.connectString(properties.getConnectString())
.retryPolicy(retryPolicy)
.namespace(properties.getNamespace())
.sessionTimeoutMs((int) properties.getSessionTimeout().toMillis())
.connectionTimeoutMs((int) properties.getConnectionTimeout().toMillis());
.sessionTimeoutMs(DurationUtils.toMillisInt(properties.getSessionTimeout()))
.connectionTimeoutMs(DurationUtils.toMillisInt(properties.getConnectionTimeout()));
final String digest = properties.getDigest();
if (!Strings.isNullOrEmpty(digest)) {
@ -102,9 +103,10 @@ final class ZookeeperRegistry implements Registry {
public void start() {
client.start();
try {
if (!client.blockUntilConnected((int) properties.getBlockUntilConnected().toMillis(), MILLISECONDS)) {
if (!client.blockUntilConnected(DurationUtils.toMillisInt(properties.getBlockUntilConnected()),
MILLISECONDS)) {
client.close();
throw new RegistryException("zookeeper connect timeout: " + properties.getConnectString());
throw new RegistryException("zookeeper connect failed in : " + properties.getConnectString() + "ms");
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
@ -120,7 +122,7 @@ final class ZookeeperRegistry implements Registry {
@Override
public void connectUntilTimeout(@NonNull Duration timeout) throws RegistryException {
try {
if (!client.blockUntilConnected((int) timeout.toMillis(), MILLISECONDS)) {
if (!client.blockUntilConnected(DurationUtils.toMillisInt(timeout), MILLISECONDS)) {
throw new RegistryException(
String.format("Cannot connect to registry in %s s", timeout.getSeconds()));
}

2
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/test/resources/application.yaml
View File

@ -26,5 +26,5 @@ registry:
max-retries: 5
session-timeout: 30s
connection-timeout: 9s
block-until-connected: 600ms
block-until-connected: 3s
digest: ~