From 3c7433f2a10cfb308314befd2d3ee4c37a0ff7a3 Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Sun, 12 Apr 2020 12:05:50 +0530
Subject: [PATCH] HDFS-15247. RBF: Provide Non DFS Used per DataNode in
 DataNode UI. Contributed by Lisheng Sun.

(cherry picked from commit 8d49229c3764a205f21750225005a2c9a8124ab9)
---
 .../src/main/webapps/router/federationhealth.html             | 4 ++++
 .../src/main/webapps/router/federationhealth.js               | 2 ++
 2 files changed, 6 insertions(+)

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 66c030973d9..534dd95794d 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
@@ -326,6 +326,8 @@
     <tr>
       <th>Node</th>
       <th>Last contact</th>
+      <th>Used</th>
+      <th>Non DFS Used</th>
       <th style="width:180px; text-align:center">Capacity</th>
       <!--th>Blocks</th-->
       <th>Block pool used</th>
@@ -336,6 +338,8 @@
   <tr>
     <td ng-value="{state}-{name}" class="dfshealth-node-icon dfshealth-node-{state}">{location}/{name} ({xferaddr})</td>
     <td ng-value="{lastContact}">{#helper_relative_time value="{lastContact}"/}</td>
+    <td ng-value="{used}">{used|fmt_bytes}</td>
+    <td ng-value="{nonDfsUsedSpace}">{nonDfsUsedSpace|fmt_bytes}</td>
     <td ng-value="{usedPercentage}" style="width:210px">
       <div>
         <div style="display:inline-block; float: left; padding-right: 10px; width:60px;">{capacity|fmt_bytes}</div>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
index 94ba67c0fd1..b7b2ba31c6c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.js
@@ -319,6 +319,8 @@
               { 'orderDataType': 'ng-value', 'searchable': true },
               { 'orderDataType': 'ng-value', 'type': 'numeric' },
               { 'orderDataType': 'ng-value', 'type': 'numeric' },
+              { 'orderDataType': 'ng-value', 'type': 'numeric' },
+              { 'orderDataType': 'ng-value', 'type': 'numeric' },
               { 'orderDataType': 'ng-value', 'type': 'numeric'}
             ]});
           $('#ui-tabs a[href="#tab-datanode"]').tab('show');