-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SNAPSHOT] Add repository validation
Fixes #7096
- Loading branch information
Showing
40 changed files
with
1,398 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "snapshot.verify_repository": { | ||
| "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-snapshots.html", | ||
| "methods": ["POST"], | ||
| "url": { | ||
| "path": "/_snapshot/{repository}/_verify", | ||
| "paths": ["/_snapshot/{repository}/_verify"], | ||
| "parts": { | ||
| "repository": { | ||
| "type": "string", | ||
| "required" : true, | ||
| "description": "A repository name" | ||
| } | ||
| }, | ||
| "params": { | ||
| "master_timeout": { | ||
| "type" : "time", | ||
| "description" : "Explicit operation timeout for connection to master node" | ||
| }, | ||
| "timeout": { | ||
| "type" : "time", | ||
| "description" : "Explicit operation timeout" | ||
| } | ||
| } | ||
| }, | ||
| "body": null | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...asticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * 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.action.admin.cluster.repositories.verify; | ||
|
|
||
| import org.elasticsearch.ElasticsearchException; | ||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.support.ActionFilters; | ||
| import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; | ||
| import org.elasticsearch.cluster.ClusterName; | ||
| import org.elasticsearch.cluster.ClusterService; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.block.ClusterBlockException; | ||
| import org.elasticsearch.cluster.block.ClusterBlockLevel; | ||
| import org.elasticsearch.common.inject.Inject; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.repositories.RepositoriesService; | ||
| import org.elasticsearch.repositories.RepositoryVerificationException; | ||
| import org.elasticsearch.threadpool.ThreadPool; | ||
| import org.elasticsearch.transport.TransportService; | ||
|
|
||
| /** | ||
| * Transport action for verifying repository operation | ||
| */ | ||
| public class TransportVerifyRepositoryAction extends TransportMasterNodeOperationAction<VerifyRepositoryRequest, VerifyRepositoryResponse> { | ||
|
|
||
| private final RepositoriesService repositoriesService; | ||
|
|
||
| protected final ClusterName clusterName; | ||
|
|
||
| @Inject | ||
| public TransportVerifyRepositoryAction(Settings settings, ClusterName clusterName, TransportService transportService, ClusterService clusterService, | ||
| RepositoriesService repositoriesService, ThreadPool threadPool, ActionFilters actionFilters) { | ||
| super(settings, VerifyRepositoryAction.NAME, transportService, clusterService, threadPool, actionFilters); | ||
| this.repositoriesService = repositoriesService; | ||
| this.clusterName = clusterName; | ||
| } | ||
|
|
||
| @Override | ||
| protected String executor() { | ||
| return ThreadPool.Names.MANAGEMENT; | ||
| } | ||
|
|
||
| @Override | ||
| protected VerifyRepositoryRequest newRequest() { | ||
| return new VerifyRepositoryRequest(); | ||
| } | ||
|
|
||
| @Override | ||
| protected VerifyRepositoryResponse newResponse() { | ||
| return new VerifyRepositoryResponse(); | ||
| } | ||
|
|
||
| @Override | ||
| protected ClusterBlockException checkBlock(VerifyRepositoryRequest request, ClusterState state) { | ||
| return state.blocks().indexBlockedException(ClusterBlockLevel.METADATA, ""); | ||
| } | ||
|
|
||
| @Override | ||
| protected void masterOperation(final VerifyRepositoryRequest request, ClusterState state, final ActionListener<VerifyRepositoryResponse> listener) throws ElasticsearchException { | ||
| repositoriesService.verifyRepository(request.name(), new ActionListener<RepositoriesService.VerifyResponse>() { | ||
| @Override | ||
| public void onResponse(RepositoriesService.VerifyResponse verifyResponse) { | ||
| if (verifyResponse.failed()) { | ||
| listener.onFailure(new RepositoryVerificationException(request.name(), verifyResponse.failureDescription())); | ||
| } else { | ||
| listener.onResponse(new VerifyRepositoryResponse(clusterName, verifyResponse.nodes())); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Throwable e) { | ||
| listener.onFailure(e); | ||
| } | ||
| }); | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...va/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * 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.action.admin.cluster.repositories.verify; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.ClusterAction; | ||
| import org.elasticsearch.client.ClusterAdminClient; | ||
|
|
||
| /** | ||
| * Unregister repository action | ||
| */ | ||
| public class VerifyRepositoryAction extends ClusterAction<VerifyRepositoryRequest, VerifyRepositoryResponse, VerifyRepositoryRequestBuilder> { | ||
|
|
||
| public static final VerifyRepositoryAction INSTANCE = new VerifyRepositoryAction(); | ||
| public static final String NAME = "cluster:admin/repository/verify"; | ||
|
|
||
| private VerifyRepositoryAction() { | ||
| super(NAME); | ||
| } | ||
|
|
||
| @Override | ||
| public VerifyRepositoryResponse newResponse() { | ||
| return new VerifyRepositoryResponse(); | ||
| } | ||
|
|
||
| @Override | ||
| public VerifyRepositoryRequestBuilder newRequestBuilder(ClusterAdminClient client) { | ||
| return new VerifyRepositoryRequestBuilder(client); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.