Distinguish "missing repository" from "missing repository plugin" #82457
Conversation
This file contains hidden or 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
Currently it is possible to uninstall repository plugin before deleting repository that uses it. In such case the repository is still listed in the API however every interraction with it produces the "no such repository" exception. This is very confusing for the users. This change updates the error message to correctly point the root of the issue.
idegtiarenko
added
:Distributed Coordination/Snapshot/Restore
idegtiarenko
commented
Jan 12, 2022
server/src/main/java/org/elasticsearch/repositories/MissingPluginRepository.java
Outdated
Show resolved
Hide resolved
idegtiarenko
commented
Jan 12, 2022
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
Outdated
Show resolved
Hide resolved
DaveCTurner
reviewed
Jan 12, 2022
Contributor
DaveCTurner
left a comment
DaveCTurner
left a comment
There was a problem hiding this comment.
Looks good @idegtiarenko, I left a few comments/suggestions.
server/src/main/java/org/elasticsearch/ElasticsearchException.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/MissingPluginRepository.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/MissingPluginRepository.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/MissingPluginRepository.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java
Outdated
Show resolved
Hide resolved
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
idegtiarenko
commented
Jan 12, 2022
Comment on lines
210
to
221
| private static void assertThatThrows(ThrowingRunnable code, Class<? extends Exception> exceptionType, Matcher<String> messageMatcher) { | ||
| try { | ||
| code.run(); | ||
| } catch (Throwable e) { | ||
| assertThat(e, exceptionType, messageMatcher); | ||
| } | ||
| } | ||
|
|
||
| private static void assertThat(Throwable exception, Class<? extends Exception> exceptionType, Matcher<String> messageMatcher) { | ||
| assertThat(exception, isA(exceptionType)); | ||
| assertThat(exception.getMessage(), messageMatcher); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Is there a good common place to move this to? May be ESTestCase?
I am missing a simple way to assert exceptions in hamcrest similarly to what assertj offers: https://assertj.github.io/doc/#assertj-core-exception-assertions
Contributor
There was a problem hiding this comment.
TBH we mostly don't care about the exception type, the message is the important bit. I think it'd fit somewhere in :test:framework:org.elasticsearch.test.hamcrest if you wanted to add a utility method for this tho.
Contributor
Author
|
@elasticmachine run elasticsearch-ci/rest-compatibility |
Contributor
Author
|
@elasticmachine run elasticsearch-ci/part-2 |
kirakoki
approved these changes
Jan 14, 2022
DaveCTurner
pushed a commit
that referenced
this pull request
Apr 4, 2022
The `RepositoryService` on each node maintains a repository instance for every repository defined in the cluster state. The master validates each repository definition before inserting it into the cluster state, but in some cases this validation is incomplete. For instance, there may be node-local configuration of which the master is unaware which prevents the repository from being instantiated on some other node in the cluster. Today if a repository cannot be instantiated then the node will log a warning and continue as if the repository doesn't exist. This results in a confusing `RepositoryMissingException` when trying to use the repository, and various other surprises (e.g. #85550). With this commit we create a placeholder `InvalidRepository` which reports a more accurate exception when it is used. Relates #82457 which did the same sort of thing for unknown plugins. Closes #85550 since the repository in question is no longer `null`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently it is possible to uninstall repository plugin before
deleting repository that uses it. In such case the repository is still
listed in the API however every interraction with it produces the
"no such repository" exception. This is very confusing for the users.
This change updates the error message to correctly point the root of the
issue.
Closes: #81758