big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-17116. RBF: Update invoke millisecond time as monotonicNow() in RouterSafemodeService (#5876). Contributed by Haiyang Hu.

Browse Source 
Reviewed-by: hfutatzhanghb <1036798979@qq.com>
Reviewed-by: Shilun Fan <slfan1989@apache.org>
Signed-off-by: He Xiaoqiao <hexiaoqiao@apache.org>
This commit is contained in:
huhaiyang 2023-07-28 15:15:00 +08:00 committed by GitHub
parent 6d32a06125
commit 87c036efb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterSafemodeService.java
View File

@ -17,13 +17,12 @@
*/ */
package org.apache.hadoop.hdfs.server.federation.router; package org.apache.hadoop.hdfs.server.federation.router;
import static org.apache.hadoop.util.Time.now; import static org.apache.hadoop.util.Time.monotonicNow;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.server.federation.store.StateStoreService; import org.apache.hadoop.hdfs.server.federation.store.StateStoreService;
import org.apache.hadoop.util.Time;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -73,7 +72,7 @@ public class RouterSafemodeService extends PeriodicService {
private long startupTime; private long startupTime;
/** The time the Router enters safe mode in milliseconds. */ /** The time the Router enters safe mode in milliseconds. */
private long enterSafeModeTime = now(); private long enterSafeModeTime = monotonicNow();
/** /**
@ -107,7 +106,7 @@ void setManualSafeMode(boolean mode) {
*/ */
private void enter() { private void enter() {
LOG.info("Entering safe mode"); LOG.info("Entering safe mode");
enterSafeModeTime = now(); enterSafeModeTime = monotonicNow();
safeMode = true; safeMode = true;
router.updateRouterState(RouterServiceState.SAFEMODE); router.updateRouterState(RouterServiceState.SAFEMODE);
} }
@ -117,7 +116,7 @@ private void enter() {
*/ */
private void leave() { private void leave() {
// Cache recently updated, leave safemode // Cache recently updated, leave safemode
long timeInSafemode = now() - enterSafeModeTime; long timeInSafemode = monotonicNow() - enterSafeModeTime;
LOG.info("Leaving safe mode after {} milliseconds", timeInSafemode); LOG.info("Leaving safe mode after {} milliseconds", timeInSafemode);
RouterMetrics routerMetrics = router.getRouterMetrics(); RouterMetrics routerMetrics = router.getRouterMetrics();
if (routerMetrics == null) { if (routerMetrics == null) {
@ -151,7 +150,7 @@ protected void serviceInit(Configuration conf) throws Exception {
LOG.info("Enter safe mode after {} ms without reaching the State Store", LOG.info("Enter safe mode after {} ms without reaching the State Store",
this.staleInterval); this.staleInterval);
this.startupTime = Time.now(); this.startupTime = monotonicNow();
// Initializing the RPC server in safe mode, it will disable it later // Initializing the RPC server in safe mode, it will disable it later
enter(); enter();
@ -161,7 +160,7 @@ protected void serviceInit(Configuration conf) throws Exception {
@Override @Override
public void periodicInvoke() { public void periodicInvoke() {
long now = Time.now(); long now = monotonicNow();
long delta = now - startupTime; long delta = now - startupTime;
if (delta < startupInterval) { if (delta < startupInterval) {
LOG.info("Delaying safemode exit for {} milliseconds...", LOG.info("Delaying safemode exit for {} milliseconds...",

2
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/StateStoreService.java
View File

@ -435,7 +435,7 @@ public void refreshCaches(boolean force) {
} }
if (success) { if (success) {
// Uses local time, not driver time. // Uses local time, not driver time.
this.cacheLastUpdateTime = Time.now(); this.cacheLastUpdateTime = Time.monotonicNow();
} }
} }