diff --git a/src/main/resources/public/users.html b/src/main/resources/public/users.html index f474b527..495110fd 100644 --- a/src/main/resources/public/users.html +++ b/src/main/resources/public/users.html @@ -40,6 +40,9 @@

User Information

+

+ View and compare users on their cluster usage.
+

@@ -50,6 +53,7 @@

User Information

+
Dir Count File Count Space Used% Old Files
@@ -82,6 +86,7 @@

User Information

innerArray.push(value.numDirs); innerArray.push(value.numFiles); innerArray.push(numberWithCommas(value.diskspace)); + innerArray.push(getPercentage(value.oldFiles1yr,value.numFiles)); array.push(innerArray); }); return array @@ -106,7 +111,7 @@

User Information

}, "iDisplayLength": 100, "aLengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]], - "order": [[1, "desc"]], + "order": [[1, "desc"], [4, "desc"], [5, "desc"]], "dom": 'Bfrtipl', "buttons": [ 'copyHtml5', 'csvHtml5', 'excelHtml5' @@ -121,7 +126,11 @@

User Information

{ title: "Last Token" }, { title: "Dir Count" }, { title: "File Count" }, - { title: "Space Used" } + { title: "Space Used" }, + { title: "% Old Files" } + ], + "columnDefs": [ + { width: "10%", targets: [1,5] } ] }); table.draw(); diff --git a/src/test/java/com/paypal/nnanalytics/TestWithMiniClusterBase.java b/src/test/java/com/paypal/nnanalytics/TestWithMiniClusterBase.java index 8e33992c..5a6f45e9 100644 --- a/src/test/java/com/paypal/nnanalytics/TestWithMiniClusterBase.java +++ b/src/test/java/com/paypal/nnanalytics/TestWithMiniClusterBase.java @@ -276,7 +276,7 @@ protected void addFiles(int numOfFiles, long sleepBetweenMs) throws Exception { if (repFactor != 0) { fileSystem.setReplication(filePath, repFactor); } - int weeksAgo = RANDOM.nextInt(10); + int weeksAgo = RANDOM.nextInt(60); long timeStamp = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(weeksAgo * 7); if (weeksAgo != 0) { fileSystem.setTimes(filePath, timeStamp, timeStamp);