Fix repo name at allocation time (#73669)

Today when allocating a previously-allocated searchable snapshot shard we simulate a recovery source which refers to the repository named in the index metadata. This doesn't work if the repository was renamed since the index was mounted, which particularly may occur if the index was itself restored from a snapshot. With this commit we instead set up the recovery source to refer to the repository whose UUID matches the one in the index metadata. We rely on such a repository existing at allocation time; if it does not then the shards are not allocated.
elastic · Jun 4, 2021 · cb463c4 · cb463c4
1 parent d654c61
commit cb463c4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java b/...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
@@ -942,6 +942,10 @@ public void testSnapshotOfSearchableSnapshotIncludesNoDataButCanBeRestored() thr
 
         assertTotalHits(restoredIndexName, originalAllHits, originalBarHits);
 
+        internalCluster().fullRestart();
+        ensureGreen(restoredIndexName);
+        assertTotalHits(restoredIndexName, originalAllHits, originalBarHits);
+
         final IllegalArgumentException remountException = expectThrows(IllegalArgumentException.class, () -> {
             try {
                 mountSnapshot(

diff --git a/...a/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java b/...a/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java
@@ -14,6 +14,8 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.RepositoriesMetadata;
+import org.elasticsearch.cluster.metadata.RepositoryMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.RecoverySource;
@@ -31,6 +33,7 @@
 import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Priority;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -59,12 +62,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import static java.util.Collections.emptyList;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_INDEX_ID_SETTING;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_INDEX_NAME_SETTING;
-import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsConstants.SNAPSHOT_PARTIAL_SETTING;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_REPOSITORY_NAME_SETTING;
+import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_REPOSITORY_UUID_SETTING;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_SNAPSHOT_ID_SETTING;
 import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshots.SNAPSHOT_SNAPSHOT_NAME_SETTING;
+import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsConstants.SNAPSHOT_PARTIAL_SETTING;
 
 public class SearchableSnapshotAllocator implements ExistingShardsAllocator {
 
@@ -144,8 +149,28 @@ public void allocateUnassigned(
                 SNAPSHOT_SNAPSHOT_NAME_SETTING.get(indexSettings),
                 SNAPSHOT_SNAPSHOT_ID_SETTING.get(indexSettings)
             );
-            final String repository = SNAPSHOT_REPOSITORY_NAME_SETTING.get(indexSettings);
-            final Snapshot snapshot = new Snapshot(repository, snapshotId);
+
+            final String repositoryUuid = SNAPSHOT_REPOSITORY_UUID_SETTING.get(indexSettings);
+            final String repositoryName;
+            if (Strings.hasLength(repositoryUuid) == false) {
+                repositoryName = SNAPSHOT_REPOSITORY_NAME_SETTING.get(indexSettings);
+            } else {
+                final RepositoriesMetadata repoMetadata = allocation.metadata().custom(RepositoriesMetadata.TYPE);
+                final List<RepositoryMetadata> repositories = repoMetadata == null ? emptyList() : repoMetadata.repositories();
+                repositoryName = repositories.stream()
+                    .filter(r -> repositoryUuid.equals(r.uuid()))
+                    .map(RepositoryMetadata::name)
+                    .findFirst()
+                    .orElse(null);
+            }
+
+            if (repositoryName == null) {
+                // TODO if the repository we seek appears later, we will need to get its UUID (usually automatic) and then reroute
+                unassignedAllocationHandler.removeAndIgnore(UnassignedInfo.AllocationStatus.DECIDERS_NO, allocation.changes());
+                return;
+            }
+
+            final Snapshot snapshot = new Snapshot(repositoryName, snapshotId);
 
             shardRouting = unassignedAllocationHandler.updateUnassigned(
                 shardRouting.unassignedInfo(),