Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix repository update with the same settings but different type #31458

Merged
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make it final?


Client client = client();
InternalTestCluster cluster = (InternalTestCluster) cluster();
RepositoriesService repositoriesService = cluster.getInstance(RepositoriesService.class);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this final? Also, I think you should use getDataOrMasterNodeInstances as the repository is only registered on master eligible and data nodes. The method getInstance() retrieves the instance from a random node and if it's not a data or master one it will not find the repository.

Settings settings = cluster.getDefaultSettings();
Path location = randomRepoPath();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's not used afterwards, maybe we don't need a ref to the location. We could simply use .put("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));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use assertAcked(client.admin().cluster().preparePutRepository(repositoryName)
.setType(FsRepository.TYPE)
.setSettings(repoSettings))


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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can remove this comment


boolean diffType = randomBoolean();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could make this more readable with:
final String updatedRepositoryType = randomBoolean() ? "mock" : FsRepository.TYPE

?


PutRepositoryResponse putRepositoryResponse2 =
client.admin().cluster().preparePutRepository(repositoryName)
.setType(diffType ? "mock" : FsRepository.TYPE)
.setSettings(repoSettings)
.get();
assertThat(putRepositoryResponse2.isAcknowledged(), equalTo(true));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use assertAcked()


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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use more explicit name? (Also for getRepositoriesResponse1/2).

assertThat(repository2, instanceOf(diffType ? MockRepository.class : FsRepository.class));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to check the implementation class, instance should be enough.

assertThat(repository2, diffType ? not(sameInstance(repository1)) : sameInstance(repository1));
}
}