Skip to content

HDFS-16411 RBF: RouterId is NULL when disable RourterRpcServer #3878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goiri merged 9 commits into from
Feb 8, 2022
Merged

HDFS-16411 RBF: RouterId is NULL when disable RourterRpcServer #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4abff0
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 12, 2022
dc03d2d
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 12, 2022
832bc38
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 13, 2022
e208d71
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 13, 2022
6a6a1da
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 17, 2022
54130c8
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 17, 2022
4a01abb
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 19, 2022
288c192
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 19, 2022
0555d4e
HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.e…
yulongz Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ protected void serviceInit(Configuration configuration) throws Exception {
this.setRpcServerAddress(rpcServer.getRpcAddress());
}

checkRouterId();

if (conf.getBoolean(
RBFConfigKeys.DFS_ROUTER_ADMIN_ENABLE,
RBFConfigKeys.DFS_ROUTER_ADMIN_ENABLE_DEFAULT)) {
Expand Down Expand Up @@ -308,6 +310,21 @@ protected void serviceInit(Configuration configuration) throws Exception {
}
}

/**
* Set the router id if not set to prevent RouterHeartbeatService
* update state store with a null router id.
*/
private void checkRouterId() {
if (this.routerId == null) {
InetSocketAddress confRpcAddress = conf.getSocketAddr(
RBFConfigKeys.DFS_ROUTER_RPC_BIND_HOST_KEY,
RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_KEY,
RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_DEFAULT,
RBFConfigKeys.DFS_ROUTER_RPC_PORT_DEFAULT);
setRpcServerAddress(confRpcAddress);
}
}

private String getDisabledDependentServices() {
if (this.stateStore == null && this.adminServer == null) {
return StateStoreService.class.getSimpleName() + ","
Expand Down
20 changes: 14 additions & 6 deletions ...op-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,14 @@ public void testRouterMetricsWhenDisabled() throws Exception {

@Test
public void testSwitchRouter() throws IOException {
assertRouterHeartbeater(true, true);
assertRouterHeartbeater(true, false);
assertRouterHeartbeater(false, true);
assertRouterHeartbeater(false, false);
assertRouterHeartbeater(true, true, true);
assertRouterHeartbeater(true, true, false);
assertRouterHeartbeater(true, false, true);
assertRouterHeartbeater(true, false, false);
assertRouterHeartbeater(false, true, true);
assertRouterHeartbeater(false, true, false);
assertRouterHeartbeater(false, false, true);
assertRouterHeartbeater(false, false, false);
}

/**
Expand All @@ -235,15 +239,19 @@ public void testSwitchRouter() throws IOException {
* @param expectedRouterHeartbeat expect the routerHeartbeat enable state.
* @param expectedNNHeartbeat expect the nnHeartbeat enable state.
*/
private void assertRouterHeartbeater(boolean expectedRouterHeartbeat,
private void assertRouterHeartbeater(boolean enableRpcServer, boolean expectedRouterHeartbeat,
boolean expectedNNHeartbeat) throws IOException {
final Router router = new Router();
Configuration baseCfg = new RouterConfigBuilder(conf).rpc().build();
Configuration baseCfg = new RouterConfigBuilder(conf).rpc(enableRpcServer).build();
baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_HEARTBEAT_ENABLE,
expectedRouterHeartbeat);
baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_NAMENODE_HEARTBEAT_ENABLE,
expectedNNHeartbeat);
router.init(baseCfg);

// RouterId can not be null , used by RouterHeartbeatService.updateStateStore()
assertNotNull(router.getRouterId());

RouterHeartbeatService routerHeartbeatService =
router.getRouterHeartbeatService();
if (expectedRouterHeartbeat) {
Expand Down