Merge remote-tracking branch 'upstream/2.1' into 3.1

apache · Oct 24, 2024 · e008f15 · e008f15
2 parents 23aa157 + 8829a22
commit e008f15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
@@ -80,6 +80,7 @@ $(document).ready(function () {
     "columnDefs": [{
         "targets": "duration",
         "render": function (data, type, row) {
+          data = data / 1_000_000; // convert from nanos to millis
           if (type === 'display') data = timeDuration(data);
           return data;
         }

diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
@@ -157,7 +157,7 @@ function levelFormat(level) {
 /**
  * Converts the time to short number and adds unit
  *
- * @param {number} time Time in microseconds
+ * @param {number} time Time in milliseconds
  * @return {string} The time with units
  */
 function timeDuration(time) {