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

Reduce amount of log messages when job scheduler execution is disabled #6816

Merged
merged 1 commit into from Nov 15, 2019

Conversation

@thll
Copy link
Contributor

thll commented Nov 15, 2019

Description

When the enterprise plugin is installed but there is no valid license
for a non-master node, job execution will be disabled. The job scheduler
would log every second that the next loop iteration cannot proceed.

Motivation and Context

Fixes #6451

How Has This Been Tested?

Started a slave. Removed the license and added the license again. Logging looked as expected.

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
When the enterprise login is installed but there is no valid license
for a non-master node, job execution will be disabled. The job scheduler
would log every second that the next loop iteration cannot proceed.

It will now log only when the state of the config changes.

Fixes #6451
@thll thll requested review from bernd and mpfz0r Nov 15, 2019
@mpfz0r mpfz0r self-assigned this Nov 15, 2019
@mpfz0r
mpfz0r approved these changes Nov 15, 2019
Copy link
Member

mpfz0r left a comment

LGTM 👍

@mpfz0r mpfz0r merged commit 9a47813 into master Nov 15, 2019
3 of 4 checks passed
3 of 4 checks passed
graylog-project/pr Jenkins build graylog-project-pr-snapshot 6789 has failed
Details
ci-web-linter Jenkins build graylog-pr-linter-check 5108 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@mpfz0r mpfz0r deleted the issue-6451 branch Nov 15, 2019
@bernd

This comment has been minimized.

Copy link
Member

bernd commented Nov 15, 2019

@thll @mpfz0r Thanks for the PR! Can you please create a stable backport for this? Thank you!

@thll thll assigned thll and unassigned mpfz0r Nov 20, 2019
thll added a commit that referenced this pull request Nov 20, 2019
#6816)

When the enterprise login is installed but there is no valid license
for a non-master node, job execution will be disabled. The job scheduler
would log every second that the next loop iteration cannot proceed.

It will now log only when the state of the config changes.

Fixes #6451

(cherry picked from commit 9a47813)
mpfz0r added a commit that referenced this pull request Nov 21, 2019
#6816) (#6837)

When the enterprise login is installed but there is no valid license
for a non-master node, job execution will be disabled. The job scheduler
would log every second that the next loop iteration cannot proceed.

It will now log only when the state of the config changes.

Fixes #6451

(cherry picked from commit 9a47813)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.