Conversation
crolopez
suggested changes
Nov 19, 2018
crolopez
approved these changes
Nov 19, 2018
32794d7 to
093fa2b
Compare
albertomn86
approved these changes
Nov 20, 2018
vikman90
reviewed
Nov 20, 2018
src/shared/cluster_utils.c
Outdated
| } | ||
| } else if (strcmp(cl_status, "yes")){ | ||
| is_worker = -1; | ||
| is_worker = 2; |
Member
There was a problem hiding this comment.
I think that this value should be 0, meaning that this node is not a worker (false).
Contributor
Author
There was a problem hiding this comment.
Should the other case (cluster configuration not found) have also a value of 0? This could also mean that this node is not a worker (or that the user unintentionally erased the cluster config)
snaow
reviewed
Nov 20, 2018
src/remoted/main.c
Outdated
| merror("Cluster node type is not valid [worker/master]. Cluster not configured. %s (%d)", strerror(errno), errno); | ||
| break; | ||
| case 1: | ||
| mdebug1("Cluster client node: Disabling the merged.mg creation"); |
Member
There was a problem hiding this comment.
client keyword still present in line 142. Change it to worker please.
vikman90
requested changes
Nov 21, 2018
src/shared/cluster_utils.c
Outdated
Member
There was a problem hiding this comment.
Please avoid mixing whitespaces and tabulations.
Member
There was a problem hiding this comment.
Please add also a changelog entry.
Thanks!
vikman90
approved these changes
Nov 21, 2018
Not showing error message when cluster configuration is diabled or non-existent. Change in error message when there's a real error (node type not valid).
Now only returns 0 or 1 values (not worker or worker)
ecdb7c1 to
7275ba2
Compare
Member
|
LGTM! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This pull request fixes #1854
The error message that was displaying when cluster configuration is disabled or non-existent is no longer displayed.
The cluster error message will only appear when a bad node type is configured in the cluster configuration (different from client/worker/master).