SNAPSHOT: Repo Creation out of ClusterStateTask #36157
Conversation
* Move `createRepository` call out of cluster state tasks
* Now only `RepositoriesService#applyClusterState` manipulates `this.repositories`
* Closes elastic#9488
original-brownbear
added
>bug
WIP
:Distributed/Snapshot/Restore
|
Pinging @elastic/es-distributed |
| @@ -371,18 +378,15 @@ private boolean registerRepository(RepositoryMetaData repositoryMetaData) throws | |||
| return false; | |||
| } | |||
| } | |||
| Repository newRepo = createRepository(repositoryMetaData); | |||
| createRepository(repositoryMetaData); | |||
| if (previous != null) { | |||
| closeRepository(previous); | |||
There was a problem hiding this comment.
that looks dangerous now (i.e., closing the existing repo). You should rather close the temporarily created repository.
There was a problem hiding this comment.
Done, the existing one is closed in org.elasticsearch.repositories.RepositoriesService#applyClusterState anyway as far as I can see :)
| @@ -362,7 +369,7 @@ public Repository repository(String repositoryName) { | |||
| * @param repositoryMetaData new repository metadata | |||
| * @return {@code true} if new repository was added or {@code false} if it was ignored | |||
| */ | |||
| private boolean registerRepository(RepositoryMetaData repositoryMetaData) throws IOException { | |||
| private boolean registerRepository(RepositoryMetaData repositoryMetaData) { | |||
| Repository previous = repositories.get(repositoryMetaData.name()); | |||
There was a problem hiding this comment.
I wonder if this logic is still needed. If we want to keep the logic to check if there have been no changes, we should just take the current repository metadata from the cluster state, and do this on the cluster state update task.
There was a problem hiding this comment.
you can then also inline this method so that it only becomes something like
try {
closeRepository(createRepository(newRepositoryMetaData));
} catch (Exception e) {
registrationListener.onFailure(e);
return;
}
There was a problem hiding this comment.
Makes sense :) Inlined as you suggest above and added a breakout to the cluster state task for the case of equal metadata.
|
@ywelsch thanks for taking a look! Applied your suggestions now :) |
|
@ywelsch thanks :) |
* Move `createRepository` call out of cluster state tasks
* Now only `RepositoriesService#applyClusterState` manipulates `this.repositories`
* Closes #9488
Addresses this comment #9488 (comment)
createRepositorycall out of cluster state tasksRepositoriesService#applyClusterStatemanipulatesthis.repositories