This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b4fed58c6ab4 HDFS-17285. RBF: Add a safe mode check period
configuration (#6347) Contributed by LiuGuH.
b4fed58c6ab4 is described below
commit b4fed58c6ab4f256542c4df3c468eb29d3ada015
Author: LiuGuH <444506...@qq.com>
AuthorDate: Thu Dec 21 12:21:59 2023 +0800
HDFS-17285. RBF: Add a safe mode check period configuration (#6347)
Contributed by LiuGuH.
Reviewed-by: Inigo Goiri <inigo...@apache.org>
Reviewed-by: Ayush Saxena <ayushsax...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../hadoop/hdfs/server/federation/router/RBFConfigKeys.java | 4 ++++
.../hdfs/server/federation/router/RouterSafemodeService.java | 4 ++--
.../hadoop-hdfs-rbf/src/main/resources/hdfs-rbf-default.xml | 11 +++++++++++
.../hdfs/server/federation/router/TestRouterSafemode.java | 6 +++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java
index 3230af8e07d5..7000a72b3a05 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java
@@ -279,6 +279,10 @@ public class RBFConfigKeys extends
CommonConfigurationKeysPublic {
FEDERATION_ROUTER_PREFIX + "safemode.expiration";
public static final long DFS_ROUTER_SAFEMODE_EXPIRATION_DEFAULT =
3 * DFS_ROUTER_CACHE_TIME_TO_LIVE_MS_DEFAULT;
+ public static final String DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS =
+ FEDERATION_ROUTER_PREFIX + "safemode.checkperiod";
+ public static final long DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS_DEFAULT =
+ TimeUnit.SECONDS.toMillis(5);
// HDFS Router-based federation mount table entries
/** Maximum number of cache entries to have. */
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterSafemodeService.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterSafemodeService.java
index ce9e1a64c51e..35ed85406528 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterSafemodeService.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterSafemodeService.java
@@ -133,8 +133,8 @@ public class RouterSafemodeService extends PeriodicService {
// Use same interval as cache update service
this.setIntervalMs(conf.getTimeDuration(
- RBFConfigKeys.DFS_ROUTER_CACHE_TIME_TO_LIVE_MS,
- RBFConfigKeys.DFS_ROUTER_CACHE_TIME_TO_LIVE_MS_DEFAULT,
+ RBFConfigKeys.DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS,
+ RBFConfigKeys.DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS_DEFAULT,
TimeUnit.MILLISECONDS));
this.startupInterval = conf.getTimeDuration(
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/resources/hdfs-rbf-default.xml
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/resources/hdfs-rbf-default.xml
index 8322a72abaae..43bd17d75f47 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/resources/hdfs-rbf-default.xml
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/resources/hdfs-rbf-default.xml
@@ -530,6 +530,17 @@
</description>
</property>
+ <property>
+ <name>dfs.federation.router.safemode.checkperiod</name>
+ <value>5s</value>
+ <description>
+ How often the Router should check safe mode. This
+ setting supports multiple time unit suffixes as described in
+ dfs.heartbeat.interval. If no suffix is specified then milliseconds is
+ assumed.
+ </description>
+ </property>
+
<property>
<name>dfs.federation.router.monitor.namenode</name>
<value></value>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterSafemode.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterSafemode.java
index 75104bd1933b..45a0089a3166 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterSafemode.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterSafemode.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdfs.server.federation.router;
import static
org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_CACHE_TIME_TO_LIVE_MS;
+import static
org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS;
import static
org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_SAFEMODE_EXPIRATION;
import static
org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_SAFEMODE_EXTENSION;
import static
org.apache.hadoop.hdfs.server.federation.store.FederationStateStoreTestUtils.deleteStateStore;
@@ -70,6 +71,9 @@ public class TestRouterSafemode {
// 200 ms cache refresh
conf.setTimeDuration(DFS_ROUTER_CACHE_TIME_TO_LIVE_MS,
200, TimeUnit.MILLISECONDS);
+ // 100 ms safemode checkperiod
+ conf.setTimeDuration(DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS,
+ 100, TimeUnit.MILLISECONDS);
// 1 sec post cache update before entering safemode (2 intervals)
conf.setTimeDuration(DFS_ROUTER_SAFEMODE_EXPIRATION,
TimeUnit.SECONDS.toMillis(1), TimeUnit.MILLISECONDS);
@@ -133,7 +137,7 @@ public class TestRouterSafemode {
long interval =
conf.getTimeDuration(DFS_ROUTER_SAFEMODE_EXTENSION,
TimeUnit.SECONDS.toMillis(2), TimeUnit.MILLISECONDS) +
- conf.getTimeDuration(DFS_ROUTER_CACHE_TIME_TO_LIVE_MS,
+ conf.getTimeDuration(DFS_ROUTER_SAFEMODE_CHECKPERIOD_MS,
TimeUnit.SECONDS.toMillis(1), TimeUnit.MILLISECONDS);
Thread.sleep(interval);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
