Reuse totalTime

Author: nicktindall

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

@@ -191,6 +191,10 @@ public Stage getStage() {
         return stage.get();
     }
 
+    public long getTotalTime() {
+        return totalTime;
+    }
+
     public void addAbortListener(ActionListener<AbortStatus> listener) {
         abortListeners.addListener(listener);
     }

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

@@ -3214,13 +3214,8 @@ public void snapshotShard(SnapshotShardContext context) {
     }
 
     private void doSnapshotShard(SnapshotShardContext context) {
-        final long startTimeInMillis = threadPool.absoluteTimeInMillis();
         blobStoreSnapshotMetrics.shardSnapshotStarted();
-        context.addListener(
-            ActionListener.running(
-                () -> blobStoreSnapshotMetrics.shardSnapshotCompleted(threadPool.absoluteTimeInMillis() - startTimeInMillis)
-            )
-        );
+        context.addListener(ActionListener.running(() -> blobStoreSnapshotMetrics.shardSnapshotCompleted(context.status().getTotalTime())));
         if (isReadOnly()) {
             context.onFailure(new RepositoryException(metadata.name(), "cannot snapshot shard on a readonly repository"));
             return;
@@ -3230,6 +3225,7 @@ private void doSnapshotShard(SnapshotShardContext context) {
         final SnapshotId snapshotId = context.snapshotId();
         final IndexShardSnapshotStatus snapshotStatus = context.status();
         snapshotStatus.updateStatusDescription("snapshot task runner: setting up shard snapshot");
+        final long startTime = threadPool.absoluteTimeInMillis();
         try {
             final ShardGeneration generation = snapshotStatus.generation();
             final BlobContainer shardContainer = shardContainer(context.indexId(), shardId);
@@ -3351,7 +3347,7 @@ private void doSnapshotShard(SnapshotShardContext context) {
 
             snapshotStatus.updateStatusDescription("snapshot task runner: starting shard snapshot");
             snapshotStatus.moveToStarted(
-                startTimeInMillis,
+                startTime,
                 indexIncrementalFileCount,
                 indexTotalNumberOfFiles,
                 indexIncrementalSize,

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

@@ -73,7 +73,9 @@ public void shardSnapshotStarted() {
 
     public void shardSnapshotCompleted(long durationInMillis) {
         snapshotMetrics.snapshotsShardsCompletedCounter().increment();
-        snapshotMetrics.snapshotShardsDurationHistogram().record(durationInMillis / 1_000f);
+        if (durationInMillis > 0) {
+            snapshotMetrics.snapshotShardsDurationHistogram().record(durationInMillis / 1_000f);
+        }
         numberOfShardSnapshotsCompleted.inc();
         shardSnapshotsInProgress.dec();
     }