lib/runtime: improve not-master error #1712
Open
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
For unclear reasons, there was an environment where the master was running, but the clients did not believe it was the master. kernel.hostname returned the unqualified hostname, as expected, but the master check was looking for the FQDN. Improve the error message as a start on making it easier to debug. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
mbakke
reviewed
Sep 23, 2023
| raise errors.OpPrereqError("This node, '%s', is not the master node, | ||
| " please connect to node '%s' and rerun " | ||
| " the command" % | ||
| % (myself, master), errors.ECODE_INVAL) |
There was a problem hiding this comment.
Looks like there is an extra % at the start of the line. Otherwise LGTM.
saschalucas
reviewed
Sep 25, 2023
| master, errors.ECODE_INVAL) | ||
| # print our own name to aid debugging, esp. re FQDN | ||
| # common error is: hostname != hostname.domain.tld | ||
| raise errors.OpPrereqError("This node, '%s', is not the master node, |
There was a problem hiding this comment.
Also there seems a missing double quote at the end:
Exception occurred:
File "/tmp/gntbuild.kZnFQSGG/ganeti/cli.py", line 62, in <module>
from ganeti.runtime import (GetClient)
File "/tmp/gntbuild.kZnFQSGG/ganeti/runtime.py", line 291
raise errors.OpPrereqError("This node, '%s', is not the master node,
^
SyntaxError: EOL while scanning string literal
codefritzel
reviewed
Sep 25, 2023
Comment on lines
+291
to
+294
| raise errors.OpPrereqError("This node, '%s', is not the master node, | ||
| " please connect to node '%s' and rerun " | ||
| " the command" % | ||
| % (myself, master), errors.ECODE_INVAL) |
There was a problem hiding this comment.
In such cases I personally prefer f-strings
Suggested change
| raise errors.OpPrereqError("This node, '%s', is not the master node, | |
| " please connect to node '%s' and rerun " | |
| " the command" % | |
| % (myself, master), errors.ECODE_INVAL) | |
| raise errors.OpPrereqError(f"This node, {myself}, is not the master node, " | |
| f"please connect to node {master} and rerun " | |
| "the command", | |
| errors.ECODE_INVAL) |
Perhaps the old %-style should be replaced by f-strings, which are supported in version 3.6?
There was a problem hiding this comment.
Thanks for your suggestion. f-strings look pretty readable. However for the moment we stay with the old % style to align with existing code. Maybe in future we can adopt to follow the language authorities standards.
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.
For unclear reasons, there was an environment where the master was running, but the clients did not believe it was the master.
kernel.hostname returned the unqualified hostname, as expected, but the master check was looking for the FQDN.
Improve the error message as a start on making it easier to debug.
Signed-off-by: Robin H. Johnson robbat2@gentoo.org