You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2019/03/04 23:16:38 UTC
[hadoop] branch HDFS-13891 updated: HDFS-14335. RBF: Fix heartbeat
typos in the Router. Contributed by CR Hota.
This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch HDFS-13891
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/HDFS-13891 by this push:
new e1d3494 HDFS-14335. RBF: Fix heartbeat typos in the Router. Contributed by CR Hota.
e1d3494 is described below
commit e1d3494066b3d02d5d90418d26651424bf681ff1
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Mon Mar 4 15:16:29 2019 -0800
HDFS-14335. RBF: Fix heartbeat typos in the Router. Contributed by CR Hota.
---
.../hadoop/hdfs/server/federation/router/Router.java | 18 +++++++++---------
.../router/TestRouterClientRejectOverload.java | 2 +-
.../router/TestRouterNamenodeMonitoring.java | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
index 0257162..7d112f9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
@@ -208,9 +208,9 @@ public class Router extends CompositeService {
// Create status updater for each monitored Namenode
this.namenodeHeartbeatServices = createNamenodeHeartbeatServices();
- for (NamenodeHeartbeatService hearbeatService :
+ for (NamenodeHeartbeatService heartbeatService :
this.namenodeHeartbeatServices) {
- addService(hearbeatService);
+ addService(heartbeatService);
}
if (this.namenodeHeartbeatServices.isEmpty()) {
@@ -487,9 +487,9 @@ public class Router extends CompositeService {
if (conf.getBoolean(
RBFConfigKeys.DFS_ROUTER_MONITOR_LOCAL_NAMENODE,
RBFConfigKeys.DFS_ROUTER_MONITOR_LOCAL_NAMENODE_DEFAULT)) {
- // Create a local heartbet service
+ // Create a local heartbeat service
NamenodeHeartbeatService localHeartbeatService =
- createLocalNamenodeHearbeatService();
+ createLocalNamenodeHeartbeatService();
if (localHeartbeatService != null) {
String nnDesc = localHeartbeatService.getNamenodeDesc();
ret.put(nnDesc, localHeartbeatService);
@@ -514,7 +514,7 @@ public class Router extends CompositeService {
}
if (nsId != null) {
NamenodeHeartbeatService heartbeatService =
- createNamenodeHearbeatService(nsId, nnId);
+ createNamenodeHeartbeatService(nsId, nnId);
if (heartbeatService != null) {
ret.put(heartbeatService.getNamenodeDesc(), heartbeatService);
}
@@ -530,7 +530,7 @@ public class Router extends CompositeService {
*
* @return Updater of the status for the local Namenode.
*/
- protected NamenodeHeartbeatService createLocalNamenodeHearbeatService() {
+ protected NamenodeHeartbeatService createLocalNamenodeHeartbeatService() {
// Detect NN running in this machine
String nsId = DFSUtil.getNamenodeNameServiceId(conf);
String nnId = null;
@@ -541,7 +541,7 @@ public class Router extends CompositeService {
}
}
- return createNamenodeHearbeatService(nsId, nnId);
+ return createNamenodeHeartbeatService(nsId, nnId);
}
/**
@@ -551,7 +551,7 @@ public class Router extends CompositeService {
* @param nnId Identifier of the namenode (HA) to monitor.
* @return Updater of the status for the specified Namenode.
*/
- protected NamenodeHeartbeatService createNamenodeHearbeatService(
+ protected NamenodeHeartbeatService createNamenodeHeartbeatService(
String nsId, String nnId) {
LOG.info("Creating heartbeat service for Namenode {} in {}", nnId, nsId);
@@ -739,7 +739,7 @@ public class Router extends CompositeService {
* Get the list of namenode heartbeat service.
*/
@VisibleForTesting
- Collection<NamenodeHeartbeatService> getNamenodeHearbeatServices() {
+ Collection<NamenodeHeartbeatService> getNamenodeHeartbeatServices() {
return this.namenodeHeartbeatServices;
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterClientRejectOverload.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterClientRejectOverload.java
index 14bd7b0..a4611f2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterClientRejectOverload.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterClientRejectOverload.java
@@ -341,7 +341,7 @@ public class TestRouterClientRejectOverload {
for (RouterContext routerContext : cluster.getRouters()) {
// Manually trigger the heartbeat
Collection<NamenodeHeartbeatService> heartbeatServices = routerContext
- .getRouter().getNamenodeHearbeatServices();
+ .getRouter().getNamenodeHeartbeatServices();
for (NamenodeHeartbeatService service : heartbeatServices) {
service.periodicInvoke();
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterNamenodeMonitoring.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterNamenodeMonitoring.java
index 75c2676..0bea11c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterNamenodeMonitoring.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterNamenodeMonitoring.java
@@ -113,7 +113,7 @@ public class TestRouterNamenodeMonitoring {
}
Collection<NamenodeHeartbeatService> heartbeatServices = routerContext
- .getRouter().getNamenodeHearbeatServices();
+ .getRouter().getNamenodeHeartbeatServices();
// manually trigger the heartbeat
for (NamenodeHeartbeatService service : heartbeatServices) {
service.periodicInvoke();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org