fix repository update with the same settings but different type

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

@@ -349,7 +349,7 @@ private boolean registerRepository(RepositoryMetaData repositoryMetaData) throws
         Repository previous = repositories.get(repositoryMetaData.name());
         if (previous != null) {
             RepositoryMetaData previousMetadata = previous.getMetadata();
-            if (!previousMetadata.type().equals(repositoryMetaData.type()) && previousMetadata.settings().equals(repositoryMetaData.settings())) {
+            if (previousMetadata.equals(repositoryMetaData)) {
                 // Previous version is the same as this one - ignore it
                 return false;
             }

server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceIT.java

@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.repositories;
+
+import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesResponse;
+import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.RepositoryMetaData;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.repositories.fs.FsRepository;
+import org.elasticsearch.snapshots.mockstore.MockRepository;
+import org.elasticsearch.test.ESIntegTestCase;
+import org.elasticsearch.test.InternalTestCluster;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.sameInstance;
+
+public class RepositoriesServiceIT extends ESIntegTestCase {
+
+    @Override
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return Collections.singletonList(MockRepository.Plugin.class);
+    }
+
+    public void testUpdateRepositoryWithDiffType() {
+        String repositoryName = "test-repo";
+
+        Client client = client();
+        InternalTestCluster cluster = (InternalTestCluster) cluster();
+        RepositoriesService repositoriesService = cluster.getInstance(RepositoriesService.class);
+        Settings settings = cluster.getDefaultSettings();
+        Path location = randomRepoPath();
+
+        Settings.Builder repoSettings = Settings.builder().put(settings).put("location", location);
+
+        PutRepositoryResponse putRepositoryResponse1 =
+            client.admin().cluster().preparePutRepository(repositoryName)
+                .setType(FsRepository.TYPE)
+                .setSettings(repoSettings)
+                .get();
+        assertThat(putRepositoryResponse1.isAcknowledged(), equalTo(true));
+
+        GetRepositoriesResponse getRepositoriesResponse1 =
+            client.admin().cluster().prepareGetRepositories(repositoryName).get();
+
+        assertThat(getRepositoriesResponse1.repositories(), hasSize(1));
+        RepositoryMetaData repositoryMetaData1 = getRepositoriesResponse1.repositories().get(0);
+
+        assertThat(repositoryMetaData1.type(), equalTo(FsRepository.TYPE));
+
+        Repository repository1 = repositoriesService.repository(repositoryName);
+        assertThat(repository1, instanceOf(FsRepository.class));
+
+        // update repository
+
+        boolean diffType = randomBoolean();
+
+        PutRepositoryResponse putRepositoryResponse2 =
+            client.admin().cluster().preparePutRepository(repositoryName)
+                .setType(diffType ? "mock" : FsRepository.TYPE)
+                .setSettings(repoSettings)
+                .get();
+        assertThat(putRepositoryResponse2.isAcknowledged(), equalTo(true));
+
+        GetRepositoriesResponse getRepositoriesResponse2 =
+            client.admin().cluster().prepareGetRepositories(repositoryName).get();
+
+        assertThat(getRepositoriesResponse2.repositories(), hasSize(1));
+        RepositoryMetaData repositoryMetaData2 = getRepositoriesResponse2.repositories().get(0);
+
+        assertThat(repositoryMetaData2.type(), equalTo(diffType ? "mock" : FsRepository.TYPE));
+
+        Repository repository2 = repositoriesService.repository(repositoryName);
+        assertThat(repository2, instanceOf(diffType ? MockRepository.class : FsRepository.class));
+        assertThat(repository2, diffType ? not(sameInstance(repository1)) : sameInstance(repository1));
+    }
+}