[#142] Tokens endpoint should provide usernames who never had a token…

… issued
paypal · Oct 23, 2018 · c6baf98 · c6baf98
1 parent f3d7888
commit c6baf98
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/docs/REST_Endpoints/Token.md b/docs/REST_Endpoints/Token.md
@@ -3,5 +3,6 @@
 `/token` is a GET only call that only CACHE users can access.
 
 Response code is 200 and a JSON dump of mapping users to the last known timestamp when a delegation token was issued to them.
+A date of `N/A` means this user has never been issued a delegation token since NNA has been observing.
 
 Response code of 403 means you are not authorized to view this endpoint.
diff --git a/src/main/java/org/apache/hadoop/hdfs/server/namenode/cache/SuggestionsEngine.java b/src/main/java/org/apache/hadoop/hdfs/server/namenode/cache/SuggestionsEngine.java
@@ -368,6 +368,9 @@ public void reloadSuggestions(NameNodeLoader nameNodeLoader) {
     final long s2 = System.currentTimeMillis();
 
     cachedLogins.putAll(nameNodeLoader.getTokenExtractor().getTokenLastLogins());
+    users.forEach(u -> cachedLogins.putIfAbsent(u, -1L));
+    cachedLogins.keySet().removeIf(u -> !fileUsers.contains(u) && !dirUsers.contains(u));
+
     cachedUsers.clear();
     cachedUsers.addAll(users);
     cachedValues.put("timeTaken", timeTaken);

diff --git a/src/main/java/org/apache/hadoop/security/token/delegation/TokenExtractor.java b/src/main/java/org/apache/hadoop/security/token/delegation/TokenExtractor.java
@@ -62,6 +62,7 @@ public Map<String, Long> getTokenLastLogins() {
       return new HashMap<String, Long>() {
         {
           put("hdfs", System.currentTimeMillis());
+          put("n/a", -1L);
         }
       };
     }

diff --git a/src/main/resources/public/tokens.html b/src/main/resources/public/tokens.html
@@ -74,10 +74,6 @@ <h1>Welcome to NNAnalytics</h1>
 <script type="text/javascript">getClusterName();</script>
 
 <script>
-    var limit = getUrlParameter("limit");
-    if(limit == null || limit.length == 0) {
-        limit = 2000;
-    }
     $.ajax({
             type: 'GET',
             url: "./token",
@@ -89,8 +85,12 @@ <h1>Welcome to NNAnalytics</h1>
                 console.log("success");
                 var tokenMap = new Object();
                 for (var user in users) {
-                    var date = new Date(users[user]).toISOString().slice(0, 10);
-                    tokenMap[user] = date;
+                    if(users[user] > 0) {
+                        var date = new Date(users[user]).toISOString().slice(0, 10);
+                        tokenMap[user] = date;
+                    } else {
+                        tokenMap[user] = "N/A";
+                    }
                 }
 
                 $("#loaderDiv").hide();