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 b4ee2e3 HDFS-14475. RBF: Expose router security enabled status on the
UI. Contributed by CR Hota.
b4ee2e3 is described below
commit b4ee2e36703845b3fb830c2c8142081eacdf1182
Author: Inigo Goiri <[email protected]>
AuthorDate: Thu May 30 16:29:18 2019 -0700
HDFS-14475. RBF: Expose router security enabled status on the UI.
Contributed by CR Hota.
---
.../hadoop/hdfs/server/federation/metrics/FederationMBean.java | 7 ++++++-
.../hadoop/hdfs/server/federation/metrics/FederationMetrics.java | 5 +++++
.../hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html | 2 +-
.../hdfs/server/federation/metrics/TestFederationMetrics.java | 2 ++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMBean.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMBean.java
index e33a77e..53b2703 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMBean.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMBean.java
@@ -240,7 +240,6 @@ public interface FederationMBean {
/**
* Get the current state of the router.
- *
* @return String label for the current router state.
*/
String getRouterStatus();
@@ -250,4 +249,10 @@ public interface FederationMBean {
* @return number of DTs
*/
long getCurrentTokensCount();
+
+ /**
+ * Get the security status of the router.
+ * @return Security status.
+ */
+ boolean isSecurityEnabled();
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMetrics.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMetrics.java
index a196098..c219a43 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMetrics.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationMetrics.java
@@ -77,6 +77,7 @@ import
org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
import org.apache.hadoop.hdfs.server.federation.store.records.RouterState;
import
org.apache.hadoop.hdfs.server.federation.store.records.StateStoreVersion;
import org.apache.hadoop.metrics2.util.MBeans;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.VersionInfo;
import org.codehaus.jettison.json.JSONObject;
@@ -615,6 +616,10 @@ public class FederationMetrics implements FederationMBean {
return -1;
}
+ public boolean isSecurityEnabled() {
+ return UserGroupInformation.isSecurityEnabled();
+ }
+
/**
* Build a set of unique values found in all namespaces.
*
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
index cf8653b..99eb6ec 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
@@ -90,7 +90,7 @@
<div class="page-header"><h1>Summary</h1></div>
{#federation}
<p>
- Security is
{#routerstat}{#SecurityEnabled}on{:else}off{/SecurityEnabled}{/routerstat}.</p>
+ Security is
{#federation}{#SecurityEnabled}on{:else}off{/SecurityEnabled}{/federation}.</p>
<p>{#router}{#Safemode}{.}{:else}Safemode is off.{/Safemode}{/router}</p>
<p>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/metrics/TestFederationMetrics.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/metrics/TestFederationMetrics.java
index 2c147eb..8758aa3 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/metrics/TestFederationMetrics.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/metrics/TestFederationMetrics.java
@@ -21,6 +21,7 @@ import static
org.apache.hadoop.hdfs.server.federation.FederationTestUtils.getBe
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import java.io.IOException;
import java.util.Iterator;
@@ -318,5 +319,6 @@ public class TestFederationMetrics extends TestMetricsBase {
assertTrue(bean.getCompileInfo().length() > 0);
assertTrue(bean.getRouterStarted().length() > 0);
assertTrue(bean.getHostAndPort().length() > 0);
+ assertFalse(bean.isSecurityEnabled());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
