methods reorg

Author: ywangd

server/src/main/java/org/elasticsearch/repositories/RepositoryData.java

@@ -461,11 +461,7 @@ public RepositoryData addSnapshot(
             snapshots,
             newSnapshotDetails,
             allIndexSnapshots,
-            ShardGenerations.builder()
-                .putAll(this.shardGenerations)
-                .putAll(shardGenerations)
-                .updateIfPresent(updatedShardGenerations.deletedIndices())
-                .build(),
+            ShardGenerations.builder().putAll(this.shardGenerations).update(updatedShardGenerations).build(),
             newIndexMetaGenerations,
             clusterUUID
         );

server/src/main/java/org/elasticsearch/repositories/ShardGenerations.java

@@ -28,6 +28,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.repositories.FinalizeSnapshotContext.*;
+
 /**
  * Represents the current {@link ShardGeneration} for each shard in a repository.
  */
@@ -231,17 +233,11 @@ public Builder putAll(ShardGenerations shardGenerations) {
             return this;
         }
 
-        public Builder updateIfPresent(ShardGenerations shardGenerations) {
-            shardGenerations.shardGenerations.forEach((indexId, gens) -> {
-                if (generations.containsKey(indexId)) {
-                    for (int i = 0; i < gens.size(); i++) {
-                        final ShardGeneration gen = gens.get(i);
-                        if (gen != null) {
-                            generations.get(indexId).put(i, gen);
-                        }
-                    }
-                }
-            });
+        public Builder update(UpdatedShardGenerations updatedShardGenerations) {
+            putAll(updatedShardGenerations.liveIndices());
+            // For deleted indices, we only update the generations if they are present in the existing generations, i.e.
+            // they are referenced by other snapshots.
+            updateIfPresent(updatedShardGenerations.deletedIndices());
             return this;
         }
 
@@ -258,6 +254,20 @@ public Builder put(IndexId indexId, int shardId, ShardGeneration generation) {
             return this;
         }
 
+        private Builder updateIfPresent(ShardGenerations shardGenerations) {
+            shardGenerations.shardGenerations.forEach((indexId, gens) -> {
+                if (generations.containsKey(indexId)) {
+                    for (int i = 0; i < gens.size(); i++) {
+                        final ShardGeneration gen = gens.get(i);
+                        if (gen != null) {
+                            generations.get(indexId).put(i, gen);
+                        }
+                    }
+                }
+            });
+            return this;
+        }
+
         private boolean noDuplicateIndicesWithSameName(IndexId newId) {
             for (IndexId id : generations.keySet()) {
                 if (id.getName().equals(newId.getName()) && id.equals(newId) == false) {

server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java

@@ -1629,10 +1629,6 @@ public void testDeleteIndexBetweenSuccessAndFinalization() {
                         }
                         l.onResponse(null);
                     }));
-            })
-            .andThen(l -> {
-                // delete the snapshot that has the deleted index so it triggers cleanup of redundant shard generations
-                client.admin().cluster().prepareDeleteSnapshot(TEST_REQUEST_TIMEOUT, repoName, "first-snapshot").execute(l.map(r -> null));
             });
 
         deterministicTaskQueue.runAllRunnableTasks();