Refactor

Author: jasontedor

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

@@ -6,33 +6,35 @@
 
 package org.elasticsearch.xpack.ccr;
 
+import org.elasticsearch.index.Index;
+
 import java.util.Locale;
 
 public class CcrRetentionLeases {
 
     /**
      * The retention lease ID used by followers.
      *
-     * @param followerUUID the follower index UUID
-     * @param leaderUUID   the leader index UUID
+     * @param localClusterName   the local cluster name
+     * @param followerIndex      the follower index
+     * @param remoteClusterAlias the remote cluster alias
+     * @param leaderIndex        the leader index
      * @return the retention lease ID
      */
     public static String retentionLeaseId(
             final String localClusterName,
-            final String remoteClusterName,
-            final String followerIndexName,
-            final String followerUUID,
-            final String leaderIndexName,
-            final String leaderUUID) {
+            final Index followerIndex,
+            final String remoteClusterAlias,
+            final Index leaderIndex) {
         return String.format(
                 Locale.ROOT,
                 "%s/%s/%s-following-%s/%s/%s",
                 localClusterName,
-                followerIndexName,
-                followerUUID,
-                remoteClusterName,
-                leaderIndexName,
-                leaderUUID);
+                followerIndex.getName(),
+                followerIndex.getUUID(),
+                remoteClusterAlias,
+                leaderIndex.getName(),
+                leaderIndex.getUUID());
     }
 
 }

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java

@@ -307,8 +307,6 @@ public void restoreShard(IndexShard indexShard, SnapshotId snapshotId, Version v
         // TODO: Add timeouts to network calls / the restore process.
         createEmptyStore(indexShard, shardId);
 
-        final String followerIndexName = indexShard.shardId().getIndex().getName();
-        final String followerUUID = indexShard.shardId().getIndex().getUUID();
         final Map<String, String> ccrMetaData = indexShard.indexSettings().getIndexMetaData().getCustomData(Ccr.CCR_CUSTOM_METADATA_KEY);
         final String leaderIndexName = ccrMetaData.get(Ccr.CCR_CUSTOM_METADATA_LEADER_INDEX_NAME_KEY);
         final String leaderUUID = ccrMetaData.get(Ccr.CCR_CUSTOM_METADATA_LEADER_INDEX_UUID_KEY);
@@ -318,7 +316,7 @@ public void restoreShard(IndexShard indexShard, SnapshotId snapshotId, Version v
         final Client remoteClient = getRemoteClusterClient();
 
         final String retentionLeaseId =
-                retentionLeaseId(localClusterName, remoteClusterAlias, followerIndexName, followerUUID, leaderIndexName, leaderUUID);
+                retentionLeaseId(localClusterName, indexShard.shardId().getIndex(), remoteClusterAlias, leaderIndex);
 
         acquireRetentionLeaseOnLeader(shardId, retentionLeaseId, leaderShardId, remoteClient);
 

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

@@ -25,6 +25,7 @@
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.seqno.RetentionLease;
@@ -330,11 +331,9 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
                         currentRetentionLeases.leases().iterator().next();
                 final String expectedRetentionLeaseId = retentionLeaseId(
                         getFollowerCluster().getClusterName(),
+                        new Index(followerIndex, followerUUID),
                         getLeaderCluster().getClusterName(),
-                        followerIndex,
-                        followerUUID,
-                        leaderIndex,
-                        leaderUUID);
+                        new Index(leaderIndex, leaderUUID));
                 assertThat(retentionLease.id(), equalTo(expectedRetentionLeaseId));
                 retentionLeases.add(currentRetentionLeases);
             }
@@ -393,11 +392,9 @@ private List<ShardStats> getShardStats(final IndicesStatsResponse stats) {
     private String getRetentionLeaseId(String followerIndex, String followerUUID, String leaderIndex, String leaderUUID) {
         return retentionLeaseId(
                             getFollowerCluster().getClusterName(),
+                            new Index(followerIndex, followerUUID),
                             getLeaderCluster().getClusterName(),
-                            followerIndex,
-                            followerUUID,
-                            leaderIndex,
-                            leaderUUID);
+                            new Index(leaderIndex, leaderUUID));
     }
 
     private void assertExpectedDocument(final String followerIndex, final int value) {

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

@@ -57,6 +57,7 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.seqno.RetentionLeaseActions;
@@ -1011,11 +1012,9 @@ public void testIndexFallBehind() throws Exception {
 
                     final String retentionLeaseId = retentionLeaseId(
                             getFollowerCluster().getClusterName(),
+                            new Index("index2", followerUUID),
                             getLeaderCluster().getClusterName(),
-                            "index2",
-                            followerUUID,
-                            "index1",
-                            leaderUUID);
+                            new Index("index1", leaderUUID));
 
                     for (final ObjectCursor<IndexShardRoutingTable> shardRoutingTable
                             : leaderRoutingTable.index("index1").shards().values()) {

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRepositoryRetentionLeaseTests.java

@@ -29,6 +29,7 @@
 import java.util.stream.Stream;
 
 import static org.elasticsearch.index.seqno.RetentionLeaseActions.RETAIN_ALL;
+import static org.elasticsearch.xpack.ccr.CcrRetentionLeases.retentionLeaseId;
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.same;
@@ -60,13 +61,8 @@ public void testWhenRetentionLeaseAlreadyExistsWeTryToRenewIt() {
         final ShardId followerShardId = new ShardId(new Index("follower-index-name", "follower-index-uuid"), 0);
         final ShardId leaderShardId = new ShardId(new Index("leader-index-name", "leader-index-uuid"), 0);
 
-        final String retentionLeaseId = CcrRetentionLeases.retentionLeaseId(
-                "local-cluster",
-                "remote-cluster",
-                followerShardId.getIndex().getName(),
-                followerShardId.getIndex().getUUID(),
-                leaderShardId.getIndex().getName(),
-                leaderShardId.getIndex().getUUID());
+        final String retentionLeaseId =
+                retentionLeaseId("local-cluster", followerShardId.getIndex(), "remote-cluster", leaderShardId.getIndex());
 
         // simulate that the the retention lease already exists on the leader, and verify that we attempt to renew it
         final Client remoteClient = mock(Client.class);
@@ -118,13 +114,8 @@ public void testWhenRetentionLeaseExpiresBeforeWeCanRenewIt() {
         final ShardId followerShardId = new ShardId(new Index("follower-index-name", "follower-index-uuid"), 0);
         final ShardId leaderShardId = new ShardId(new Index("leader-index-name", "leader-index-uuid"), 0);
 
-        final String retentionLeaseId = CcrRetentionLeases.retentionLeaseId(
-                "local-cluster",
-                "remote-cluster",
-                followerShardId.getIndex().getName(),
-                followerShardId.getIndex().getUUID(),
-                leaderShardId.getIndex().getName(),
-                leaderShardId.getIndex().getUUID());
+        final String retentionLeaseId =
+                retentionLeaseId("local-cluster", followerShardId.getIndex(), "remote-cluster", leaderShardId.getIndex());
 
         // simulate that the the retention lease already exists on the leader, expires before we renew, and verify that we attempt to add it
         final Client remoteClient = mock(Client.class);