Apache Solr open-source search software
SOLR-17830: Fix backup/collection-name conflation in v1 Restore API (#3479)
Abhishek Umarjikar577dee150776
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 6e88eedd506..58588ec5eef 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -251,6 +251,8 @@ Bug Fixes* SOLR-17834: Fixed a bug preventing Config API set properties (aka: configoverlay.json) from being used in config file propertysubstitution (hossman)+* SOLR-17830: v1 Restore API no longer conflates backup-name and collection-name during validation. (Abhishek Umarjikar via Jason Gerlowski)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollection.java b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollection.javaindex 12da6f005f8..7ee3bb994cc 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollection.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/RestoreCollection.java@@ -47,6 +47,7 @@ import org.apache.solr.cloud.api.collections.CollectionHandlingUtils;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.ZkNodeProps;import org.apache.solr.common.params.CollectionParams;+import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;@@ -192,8 +193,11 @@ public class RestoreCollection extends BackupAPIBase implements CollectionBackuprestoreBody.backupId = solrParams.getInt(BACKUP_ID);restoreBody.async = solrParams.get(ASYNC);+ ModifiableSolrParams createCollectionParams = new ModifiableSolrParams(solrParams);+ createCollectionParams.set(NAME, solrParams.get(COLLECTION_PROP));+restoreBody.createCollectionParams =- CreateCollection.createRequestBodyFromV1Params(solrParams, false);+ CreateCollection.createRequestBodyFromV1Params(createCollectionParams, false);return restoreBody;}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.javaindex 63999f034db..ce9833771f9 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/RestoreCollectionAPITest.java@@ -202,8 +202,10 @@ public class RestoreCollectionAPITest extends SolrTestCaseJ4 {assertEquals("someRepositoryName", requestBody.repository);assertEquals(Integer.valueOf(123), requestBody.backupId);assertEquals("someAsyncId", requestBody.async);+ // Ensure the nested "collection-creation" object looks as expectedassertNotNull(requestBody.createCollectionParams);final var createParams = requestBody.createCollectionParams;+ assertEquals("someCollectionName", createParams.name);assertEquals("someConfig", createParams.config);assertEquals(Integer.valueOf(123), createParams.nrtReplicas);assertNotNull(createParams.properties);