This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new aef7a33fb54 [MINOR] Use configutils to handle defaults for all zk lock
provider configs (#13039)
aef7a33fb54 is described below
commit aef7a33fb54480ed1219979a4f765487f19d349e
Author: Tim Brown <t...@onehouse.ai>
AuthorDate: Thu Mar 27 01:01:59 2025 -0500
[MINOR] Use configutils to handle defaults for all zk lock provider configs
(#13039)
---
.../lock/BaseZookeeperBasedLockProvider.java | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/BaseZookeeperBasedLockProvider.java
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/BaseZookeeperBasedLockProvider.java
index 496d754f025..807226460a4 100644
---
a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/BaseZookeeperBasedLockProvider.java
+++
b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/BaseZookeeperBasedLockProvider.java
@@ -21,6 +21,7 @@ package org.apache.hudi.client.transaction.lock;
import org.apache.hudi.common.config.LockConfiguration;
import org.apache.hudi.common.lock.LockProvider;
import org.apache.hudi.common.lock.LockState;
+import org.apache.hudi.common.util.ConfigUtils;
import org.apache.hudi.common.util.StringUtils;
import org.apache.hudi.common.util.ValidationUtils;
import org.apache.hudi.exception.HoodieLockException;
@@ -39,14 +40,13 @@ import javax.annotation.concurrent.NotThreadSafe;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
-import static
org.apache.hudi.common.config.LockConfiguration.DEFAULT_ZK_CONNECTION_TIMEOUT_MS;
-import static
org.apache.hudi.common.config.LockConfiguration.DEFAULT_ZK_SESSION_TIMEOUT_MS;
-import static
org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY;
-import static
org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_RETRY_MAX_WAIT_TIME_IN_MILLIS_PROP_KEY;
-import static
org.apache.hudi.common.config.LockConfiguration.LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY;
-import static
org.apache.hudi.common.config.LockConfiguration.ZK_CONNECTION_TIMEOUT_MS_PROP_KEY;
import static
org.apache.hudi.common.config.LockConfiguration.ZK_CONNECT_URL_PROP_KEY;
-import static
org.apache.hudi.common.config.LockConfiguration.ZK_SESSION_TIMEOUT_MS_PROP_KEY;
+import static org.apache.hudi.config.HoodieLockConfig.LOCK_ACQUIRE_NUM_RETRIES;
+import static
org.apache.hudi.config.HoodieLockConfig.LOCK_ACQUIRE_RETRY_MAX_WAIT_TIME_IN_MILLIS;
+import static
org.apache.hudi.config.HoodieLockConfig.LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS;
+import static org.apache.hudi.config.HoodieLockConfig.ZK_CONNECTION_TIMEOUT_MS;
+import static org.apache.hudi.config.HoodieLockConfig.ZK_CONNECT_URL;
+import static org.apache.hudi.config.HoodieLockConfig.ZK_SESSION_TIMEOUT_MS;
/**
* A zookeeper based lock. This {@link LockProvider} implementation allows to
lock table operations
@@ -69,12 +69,13 @@ public abstract class BaseZookeeperBasedLockProvider
implements LockProvider<Int
zkBasePath = getZkBasePath(lockConfiguration);
lockKey = getLockKey(lockConfiguration);
this.curatorFrameworkClient = CuratorFrameworkFactory.builder()
-
.connectString(lockConfiguration.getConfig().getString(ZK_CONNECT_URL_PROP_KEY))
- .retryPolicy(new
BoundedExponentialBackoffRetry(lockConfiguration.getConfig().getInteger(LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY),
-
lockConfiguration.getConfig().getInteger(LOCK_ACQUIRE_RETRY_MAX_WAIT_TIME_IN_MILLIS_PROP_KEY),
-
lockConfiguration.getConfig().getInteger(LOCK_ACQUIRE_NUM_RETRIES_PROP_KEY)))
-
.sessionTimeoutMs(lockConfiguration.getConfig().getInteger(ZK_SESSION_TIMEOUT_MS_PROP_KEY,
DEFAULT_ZK_SESSION_TIMEOUT_MS))
-
.connectionTimeoutMs(lockConfiguration.getConfig().getInteger(ZK_CONNECTION_TIMEOUT_MS_PROP_KEY,
DEFAULT_ZK_CONNECTION_TIMEOUT_MS))
+
.connectString(ConfigUtils.getStringWithAltKeys(lockConfiguration.getConfig(),
ZK_CONNECT_URL))
+ .retryPolicy(new BoundedExponentialBackoffRetry(
+ ConfigUtils.getIntWithAltKeys(lockConfiguration.getConfig(),
LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS),
+ ConfigUtils.getIntWithAltKeys(lockConfiguration.getConfig(),
LOCK_ACQUIRE_RETRY_MAX_WAIT_TIME_IN_MILLIS),
+ ConfigUtils.getIntWithAltKeys(lockConfiguration.getConfig(),
LOCK_ACQUIRE_NUM_RETRIES)))
+
.sessionTimeoutMs(ConfigUtils.getIntWithAltKeys(lockConfiguration.getConfig(),
ZK_SESSION_TIMEOUT_MS))
+
.connectionTimeoutMs(ConfigUtils.getIntWithAltKeys(lockConfiguration.getConfig(),
ZK_CONNECTION_TIMEOUT_MS))
.build();
this.curatorFrameworkClient.start();
createPathIfNotExists();
