Fix bug in verdi daemon restart --reset
#3969
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
sphuber
added
the
pr/blocked
Codecov Report
@@ Coverage Diff @@
## develop #3969 +/- ##
===========================================
+ Coverage 78.33% 78.44% +0.10%
===========================================
Files 461 461
Lines 34076 34077 +1
===========================================
+ Hits 26694 26731 +37
+ Misses 7382 7346 -36
Continue to review full report at Codecov.
|
sphuber
force-pushed
the
fix/3960/verdi-daemon-restart
branch
from
bfaf1a1
to
f374f9b
Compare
sphuber
added
pr/ready-for-review
giovannipizzi
approved these changes
Apr 27, 2020
| # Due to that bug, the `callback` of the `number` argument the `start` command is not being called, which is | ||
| # responsible for settting the default value, which causes `None` to be passed and that triggers an exception. | ||
| # As a temporary workaround, we fetch the default here manually and pass that in explicitly. | ||
| number = ctx.obj.config.get_option('daemon.default_workers', ctx.obj.profile.name) |
There was a problem hiding this comment.
Just to double check, ctx.obj.profile.name is always set even if not explicitly specified?
There was a problem hiding this comment.
Barring a bug, it should be. It is set in aiida.cmdline.commands.cmd_verdi.verdi
The command `verdi daemon restart --reset` was excepting when it was invoking the `verdi daemon start` command. The reason being that recently the `number` argument of `verdi daemon start` was changed to not define a default directly, but to go through a callback. This would then set the default based on a configuration option for the current profile. However, due to a bug in `click`, parameter callbacks are not called when invoking a command through `Context.invoke`, which caused the `number` argument to be `None` which triggered an exception. Until that bug is fixed in `click`, which has issue aiidateam#950, we add a workaround to manually defining the default value, that would normally have been done by the argument callback, and explicitly passing it in the invoke call.
sphuber
force-pushed
the
fix/3960/verdi-daemon-restart
branch
from
f374f9b
to
7a111dd
Compare
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.
Fixes #3960
The command
verdi daemon restart --resetwas excepting when it wasinvoking the
verdi daemon startcommand. The reason being that recentlythe
numberargument ofverdi daemon startwas changed to not definea default directly, but to go through a callback. This would then set
the default based on a configuration option for the current profile.
However, due to a bug in
click, parameter callbacks are not calledwhen invoking a command through
Context.invoke, which caused thenumberargument to beNonewhich triggered an exception. Until thatbug is fixed in
click, which has issue #950, we add a workaround tomanually defining the default value, that would normally have been done
by the argument callback, and explicitly passing it in the invoke call.
N.B.: I opened a PR that fixes the underlying bug in
click.