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

Only flush Watcher's bulk processor if Watcher is enabled #38803

Merged
merged 1 commit into from
Feb 13, 2019

Conversation

dakrone
Copy link
Member

@dakrone dakrone commented Feb 12, 2019

When shutting down Watcher, the bulkProcessor is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves #38798

When shutting down Watcher, the `bulkProcessor` is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves elastic#38798
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-features

@dakrone
Copy link
Member Author

dakrone commented Feb 12, 2019

@elasticmachine run elasticsearch-ci/1

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM.

@jakelandis jakelandis added v6.6.2 and removed v6.6.1 labels Feb 13, 2019
@dakrone dakrone merged commit 70e5a72 into elastic:master Feb 13, 2019
dakrone added a commit that referenced this pull request Feb 13, 2019
When shutting down Watcher, the `bulkProcessor` is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves #38798
dakrone added a commit that referenced this pull request Feb 13, 2019
When shutting down Watcher, the `bulkProcessor` is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves #38798
dakrone added a commit that referenced this pull request Feb 13, 2019
When shutting down Watcher, the `bulkProcessor` is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves #38798
dakrone added a commit that referenced this pull request Feb 13, 2019
When shutting down Watcher, the `bulkProcessor` is null if watcher has been
disabled in the configuration. This protects the flush and close calls with a
check for watcher enabled to avoid a NullPointerException

Resolves #38798
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Feb 14, 2019
* elastic/master:
  Only flush Watcher's bulk processor if Watcher is enabled (elastic#38803)
  Update the removal of types docs with the new 6.7 behavior. (elastic#38869)
@dakrone dakrone deleted the handle-disabled-watcher-shutdown branch February 14, 2019 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disabling xpack watcher causes NPE when Elasticsearch is shutdown
6 participants