Include unit in IndexShardSnapshotStatus#(startTime|totalTime)

Author: nicktindall

server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java

@@ -88,8 +88,8 @@ public enum AbortStatus {
     private final AtomicReference<Stage> stage;
     private final AtomicReference<ShardGeneration> generation;
     private final AtomicReference<ShardSnapshotResult> shardSnapshotResult; // only set in stage DONE
-    private long startTime;
-    private long totalTime;
+    private long startTimeMillis;
+    private long totalTimeMillis;
     private int incrementalFileCount;
     private int totalFileCount;
     private int processedFileCount;
@@ -102,8 +102,8 @@ public enum AbortStatus {
 
     private IndexShardSnapshotStatus(
         final Stage stage,
-        final long startTime,
-        final long totalTime,
+        final long startTimeMillis,
+        final long totalTimeMillis,
         final int incrementalFileCount,
         final int totalFileCount,
         final int processedFileCount,
@@ -117,8 +117,8 @@ private IndexShardSnapshotStatus(
         this.stage = new AtomicReference<>(Objects.requireNonNull(stage));
         this.generation = new AtomicReference<>(generation);
         this.shardSnapshotResult = new AtomicReference<>();
-        this.startTime = startTime;
-        this.totalTime = totalTime;
+        this.startTimeMillis = startTimeMillis;
+        this.totalTimeMillis = totalTimeMillis;
         this.incrementalFileCount = incrementalFileCount;
         this.totalFileCount = totalFileCount;
         this.processedFileCount = processedFileCount;
@@ -130,14 +130,14 @@ private IndexShardSnapshotStatus(
     }
 
     public synchronized Copy moveToStarted(
-        final long startTime,
+        final long startTimeMillis,
         final int incrementalFileCount,
         final int totalFileCount,
         final long incrementalSize,
         final long totalSize
     ) {
         if (stage.compareAndSet(Stage.INIT, Stage.STARTED)) {
-            this.startTime = startTime;
+            this.startTimeMillis = startTimeMillis;
             this.incrementalFileCount = incrementalFileCount;
             this.totalFileCount = totalFileCount;
             this.incrementalSize = incrementalSize;
@@ -172,11 +172,11 @@ public synchronized Copy moveToFinalize() {
         };
     }
 
-    public synchronized void moveToDone(final long endTime, final ShardSnapshotResult shardSnapshotResult) {
+    public synchronized void moveToDone(final long endTimeMillis, final ShardSnapshotResult shardSnapshotResult) {
         assert shardSnapshotResult != null;
         assert shardSnapshotResult.getGeneration() != null;
         if (stage.compareAndSet(Stage.FINALIZE, Stage.DONE)) {
-            this.totalTime = Math.max(0L, endTime - startTime);
+            this.totalTimeMillis = Math.max(0L, endTimeMillis - startTimeMillis);
             this.shardSnapshotResult.set(shardSnapshotResult);
             this.generation.set(shardSnapshotResult.getGeneration());
         } else {
@@ -191,8 +191,8 @@ public Stage getStage() {
         return stage.get();
     }
 
-    public long getTotalTime() {
-        return totalTime;
+    public long getTotalTimeMillis() {
+        return totalTimeMillis;
     }
 
     public void addAbortListener(ActionListener<AbortStatus> listener) {
@@ -225,7 +225,7 @@ private synchronized void abortAndMoveToStageIfNotCompleted(
     public synchronized SnapshotsInProgress.ShardState moveToUnsuccessful(final Stage newStage, final String failure, final long endTime) {
         assert newStage == Stage.PAUSED || newStage == Stage.FAILURE : newStage;
         if (newStage == Stage.PAUSED && stage.compareAndSet(Stage.PAUSING, Stage.PAUSED)) {
-            this.totalTime = Math.max(0L, endTime - startTime);
+            this.totalTimeMillis = Math.max(0L, endTime - startTimeMillis);
             this.failure = failure;
             return SnapshotsInProgress.ShardState.PAUSED_FOR_NODE_REMOVAL;
         }
@@ -237,7 +237,7 @@ public synchronized SnapshotsInProgress.ShardState moveToUnsuccessful(final Stag
     public synchronized void moveToFailed(final long endTime, final String failure) {
         if (stage.getAndSet(Stage.FAILURE) != Stage.FAILURE) {
             abortListeners.onResponse(AbortStatus.NO_ABORT);
-            this.totalTime = Math.max(0L, endTime - startTime);
+            this.totalTimeMillis = Math.max(0L, endTime - startTimeMillis);
             this.failure = failure;
         }
     }
@@ -297,8 +297,8 @@ public void updateStatusDescription(String statusString) {
     public synchronized IndexShardSnapshotStatus.Copy asCopy() {
         return new IndexShardSnapshotStatus.Copy(
             stage.get(),
-            startTime,
-            totalTime,
+            startTimeMillis,
+            totalTimeMillis,
             incrementalFileCount,
             totalFileCount,
             processedFileCount,
@@ -471,9 +471,9 @@ public String toString() {
             + "stage="
             + stage
             + ", startTime="
-            + startTime
+            + startTimeMillis
             + ", totalTime="
-            + totalTime
+            + totalTimeMillis
             + ", incrementalFileCount="
             + incrementalFileCount
             + ", totalFileCount="

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreSnapshotMetrics.java

@@ -85,7 +85,7 @@ public void shardSnapshotStarted() {
     public void shardSnapshotCompleted(IndexShardSnapshotStatus status) {
         final Map<String, Object> attrsWithStage = Maps.copyMapWithAddedEntry(metricAttributes, "stage", status.getStage().name());
         snapshotMetrics.shardsCompletedCounter().incrementBy(1, attrsWithStage);
-        snapshotMetrics.shardsDurationHistogram().record(status.getTotalTime() / 1_000f, attrsWithStage);
+        snapshotMetrics.shardsDurationHistogram().record(status.getTotalTimeMillis() / 1_000d, attrsWithStage);
         numberOfShardSnapshotsCompleted.inc();
         shardSnapshotsInProgress.dec();
     }