Do not add index event listener if CCR disabled #37432
Merged
Conversation
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
Currently we add the `CcrRestoreSourceService` as a index event listener. However, if ccr is disabled, this service is null and we attempt to add a null listener throwing an exception. This commit only adds the listener if ccr is enabled.
Tim-Brooks
added
>bug
v7.0.0
:Distributed Indexing/CCR
|
Pinging @elastic/es-distributed |
ywelsch
reviewed
Jan 14, 2019
|
I've added a test @ywelsch |
ywelsch
approved these changes
Jan 14, 2019
| public class CcrDisabledIT extends ESIntegTestCase { | ||
|
|
||
| public void testClusterCanStartWithCcrInstalledButNotEnabled() throws Exception { | ||
| ensureGreen(); |
There was a problem hiding this comment.
I think that the problem that is fixed here only occurs when an index is created, so let's create an index in this test. Perhaps also invoke the XPackClient.prepareInfo() API to check whether the plugin is disabled.
There was a problem hiding this comment.
I mean I specifically tried and the test failed without the my fix in the Ccr.java class. You can see it happens when the add listener method is called:
public void addIndexEventListener(IndexEventListener listener) {
ensureNotFrozen();
if (listener == null) {
throw new IllegalArgumentException("listener must not be null");
}
if (indexEventListeners.contains(listener)) {
throw new IllegalArgumentException("listener already added");
}
this.indexEventListeners.add(listener);
}
I will add the prepareInfo check.
There was a problem hiding this comment.
Also - it looks like CCR has not implemented the XPackFeatureSet functionality? When I search for references, it is not referenced in the ccr package.
There was a problem hiding this comment.
There is a PR open for this.
|
run gradle build tests 1 |
|
run gradle build tests 2 |
|
run gradle build tests 1 |
Tim-Brooks
added a commit
that referenced
this pull request
Jan 18, 2019
Currently we add the CcrRestoreSourceService as a index event listener. However, if ccr is disabled, this service is null and we attempt to add a null listener throwing an exception. This commit only adds the listener if ccr is enabled.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Jan 20, 2019
* elastic/master: Remove Watcher Account "unsecure" settings (elastic#36736) Add cache cleaning task for ML snapshot (elastic#37505) Update jdk used by the docker builds (elastic#37621) Remove an unused constant in PutMappingRequest. Update get users to allow unknown fields (elastic#37593) Do not add index event listener if CCR disabled (elastic#37432) Add local session timeouts to leader node (elastic#37438)
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Jan 21, 2019
* elastic/master: (104 commits) Permission for restricted indices (elastic#37577) Remove Watcher Account "unsecure" settings (elastic#36736) Add cache cleaning task for ML snapshot (elastic#37505) Update jdk used by the docker builds (elastic#37621) Remove an unused constant in PutMappingRequest. Update get users to allow unknown fields (elastic#37593) Do not add index event listener if CCR disabled (elastic#37432) Add local session timeouts to leader node (elastic#37438) Add some deprecation optimizations (elastic#37597) refactor inner geogrid classes to own class files (elastic#37596) Remove obsolete deprecation checks (elastic#37510) ML: Add support for single bucket aggs in Datafeeds (elastic#37544) ML: creating ML State write alias and pointing writes there (elastic#37483) Deprecate types in the put mapping API. (elastic#37280) [ILM] Add unfollow action (elastic#36970) Packaging: Update marker used to allow ELASTIC_PASSWORD (elastic#37243) Fix setting openldap realm ssl config Document the need for JAVA11_HOME (elastic#37589) SQL: fix object extraction from sources (elastic#37502) Nit in settings.gradle for Eclipse ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 we add the
CcrRestoreSourceServiceas a index eventlistener. However, if ccr is disabled, this service is null and we
attempt to add a null listener throwing an exception. This commit only
adds the listener if ccr is enabled.