iter

Author: martijnvg

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTask.java

@@ -67,6 +67,7 @@ public abstract class ShardFollowNodeTask extends AllocatedPersistentTask {
 
     private static final Logger LOGGER = Loggers.getLogger(ShardFollowNodeTask.class);
 
+    private final String leaderIndex;
     private final ShardFollowTask params;
     private final TimeValue retryTimeout;
     private final TimeValue idleShardChangesRequestDelay;
@@ -113,6 +114,12 @@ protected boolean removeEldestEntry(final Map.Entry<Long, ElasticsearchException
                 return size() > params.getMaxConcurrentReadBatches();
             }
         };
+
+        if (params.getLeaderClusterAlias() != null) {
+            leaderIndex = params.getLeaderClusterAlias() + ":" + params.getLeaderShardId().getIndexName();
+        } else {
+            leaderIndex = params.getLeaderShardId().getIndexName();
+        }
     }
 
     void start(
@@ -416,12 +423,6 @@ public ShardId getFollowShardId() {
 
     @Override
     public synchronized Status getStatus() {
-        final String leaderIndex;
-        if (params.getLeaderClusterAlias() != null) {
-            leaderIndex = params.getLeaderClusterAlias() + ":" + params.getLeaderShardId().getIndexName();
-        } else {
-            leaderIndex = params.getLeaderShardId().getIndexName();
-        }
         final long timeSinceLastFetchMillis;
         if (lastFetchTime != -1) {
              timeSinceLastFetchMillis = TimeUnit.NANOSECONDS.toMillis(relativeTimeProvider.getAsLong() - lastFetchTime);
@@ -681,12 +682,12 @@ public NavigableMap<Long, ElasticsearchException> fetchExceptions() {
 
         private final long timeSinceLastFetchMillis;
 
-        public long timeSinceLastFetch() {
+        public long timeSinceLastFetchMillis() {
             return timeSinceLastFetchMillis;
         }
 
         Status(
-                String leaderIndex,
+                final String leaderIndex,
                 final int shardId,
                 final long leaderGlobalCheckpoint,
                 final long leaderMaxSeqNo,

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTaskStatusTests.java

@@ -90,7 +90,7 @@ protected void assertEqualInstances(final ShardFollowNodeTask.Status expectedIns
                     anyOf(instanceOf(ElasticsearchException.class), instanceOf(IllegalStateException.class)));
             assertThat(entry.getValue().getCause().getMessage(), containsString(expected.getCause().getMessage()));
         }
-        assertThat(newInstance.timeSinceLastFetch(), equalTo(expectedInstance.timeSinceLastFetch()));
+        assertThat(newInstance.timeSinceLastFetchMillis(), equalTo(expectedInstance.timeSinceLastFetchMillis()));
     }
 
     @Override