Merge branch '2.1' into 3.1

Author: ddanielr

core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java

@@ -75,7 +75,7 @@ public RunningCompactionInfo(TExternalCompaction ec) {
     if (lastEntry != null) {
       last = lastEntry.getValue();
       updateMillis = lastEntry.getKey();
-      duration = last.getCompactionAgeNanos();
+      duration = NANOSECONDS.toMillis(last.getCompactionAgeNanos());
     } else {
       log.debug("No updates found for {}", ecid);
       lastUpdate = 1;
@@ -84,7 +84,7 @@ public RunningCompactionInfo(TExternalCompaction ec) {
       duration = 0;
       return;
     }
-    long durationMinutes = NANOSECONDS.toMinutes(duration);
+    long durationMinutes = MILLISECONDS.toMinutes(duration);
     if (durationMinutes > 15) {
       log.warn("Compaction {} has been running for {} minutes", ecid, durationMinutes);
     }

server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js

@@ -80,7 +80,6 @@ $(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;
         }

test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java

@@ -19,7 +19,7 @@
 package org.apache.accumulo.test.compaction;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_READ;
 import static org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_WRITTEN;
 import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.QUEUE1;
@@ -184,7 +184,7 @@ public void testCompactionDurationContinuesAfterCoordinatorStop() throws Excepti
           .getCompactions().values().iterator().next();
       RunningCompactionInfo updatedCompactionInfo = new RunningCompactionInfo(updatedCompaction);
 
-      final Duration reportedCompactionDuration = Duration.ofNanos(updatedCompactionInfo.duration);
+      final Duration reportedCompactionDuration = Duration.ofMillis(updatedCompactionInfo.duration);
       final Duration measuredCompactionDuration =
           Duration.ofNanos(System.nanoTime() - compactionStartTime);
       final Duration coordinatorAge = Duration.ofNanos(System.nanoTime() - coordinatorRestartTime);
@@ -431,7 +431,7 @@ private void checkRunning() throws TException {
         RunningCompactionInfo rci = new RunningCompactionInfo(ec);
         RunningCompactionInfo previousRci = runningMap.put(ecid, rci);
         log.debug("ECID {} has been running for {} seconds", ecid,
-            NANOSECONDS.toSeconds(rci.duration));
+            MILLISECONDS.toSeconds(rci.duration));
         if (previousRci == null) {
           log.debug("New ECID {} with inputFiles: {}", ecid, rci.numFiles);
         } else {