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 fe...@apache.org on 2021/09/12 11:53:13 UTC
[hadoop] branch trunk updated: HDFS-16221. RBF: Add usage of
refreshCallQueue for Router (#3421)
This is an automated email from the ASF dual-hosted git repository.
ferhui 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 7f6553a HDFS-16221. RBF: Add usage of refreshCallQueue for Router (#3421)
7f6553a is described below
commit 7f6553af7546e512f51ba21cbd6cb4e7b73c1961
Author: Symious <yi...@foxmail.com>
AuthorDate: Sun Sep 12 19:52:47 2021 +0800
HDFS-16221. RBF: Add usage of refreshCallQueue for Router (#3421)
---
.../org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java | 8 +++++++-
.../hdfs/server/federation/router/TestRouterAdminCLI.java | 10 ++++++++++
.../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 2 ++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
index deadf3d..b8e7c79 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
@@ -135,7 +135,7 @@ public class RouterAdmin extends Configured implements Tool {
"-setStorageTypeQuota", "-clrQuota", "-clrStorageTypeQuota",
"-safemode", "-nameservice", "-getDisabledNameservices",
"-refresh", "-refreshRouterArgs",
- "-refreshSuperUserGroupsConfiguration"};
+ "-refreshSuperUserGroupsConfiguration", "-refreshCallQueue"};
StringBuilder usage = new StringBuilder();
usage.append("Usage: hdfs dfsrouteradmin :\n");
for (int i = 0; i < commands.length; i++) {
@@ -185,6 +185,8 @@ public class RouterAdmin extends Configured implements Tool {
return "\t[-refreshRouterArgs <host:ipc_port> <key> [arg1..argn]]";
} else if (cmd.equals("-refreshSuperUserGroupsConfiguration")) {
return "\t[-refreshSuperUserGroupsConfiguration]";
+ } else if (cmd.equals("-refreshCallQueue")) {
+ return "\t[-refreshCallQueue]";
}
return getUsage(null);
}
@@ -222,6 +224,10 @@ public class RouterAdmin extends Configured implements Tool {
if (arg.length > 1) {
throw new IllegalArgumentException("No arguments allowed");
}
+ } else if (arg[0].equals("-refreshCallQueue")) {
+ if (arg.length > 1) {
+ throw new IllegalArgumentException("No arguments allowed");
+ }
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
index 4134b49..b9dff65 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
@@ -1744,9 +1744,19 @@ public class TestRouterAdminCLI {
public void testRefreshCallQueue() throws Exception {
System.setOut(new PrintStream(out));
+ System.setErr(new PrintStream(err));
+
String[] argv = new String[]{"-refreshCallQueue"};
assertEquals(0, ToolRunner.run(admin, argv));
assertTrue(out.toString().contains("Refresh call queue successfully"));
+
+ argv = new String[]{};
+ assertEquals(-1, ToolRunner.run(admin, argv));
+ assertTrue(out.toString().contains("-refreshCallQueue"));
+
+ argv = new String[]{"-refreshCallQueue", "redundant"};
+ assertEquals(-1, ToolRunner.run(admin, argv));
+ assertTrue(err.toString().contains("No arguments allowed"));
}
private void addMountTable(String src, String nsId, String dst)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
index 175c865..a1509d2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
@@ -458,6 +458,7 @@ Usage:
[-refresh]
[-refreshRouterArgs <host:ipc_port> <key> [arg1..argn]]
[-refreshSuperUserGroupsConfiguration]
+ [-refreshCallQueue]
| COMMAND\_OPTION | Description |
|:---- |:---- |
@@ -476,6 +477,7 @@ Usage:
| `-refresh` | Update mount table cache of the connected router. |
| `refreshRouterArgs` \<host:ipc\_port\> \<key\> [arg1..argn] | To trigger a runtime-refresh of the resource specified by \<key\> on \<host:ipc\_port\>. For example, to enable white list checking, we just need to send a refresh command other than restart the router server. |
| `-refreshSuperUserGroupsConfiguration` | Refresh superuser proxy groups mappings on Router. |
+| `-refreshCallQueue` | Reload the call queue from config for Router. |
The commands for managing Router-based federation. See [Mount table management](../hadoop-hdfs-rbf/HDFSRouterFederation.html#Mount_table_management) for more info.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org