fix(cmd/influxd): prevent panic on upgrade with V1 users and no V1 conf #20548
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
danxmoran
force-pushed
the
dm-fix-upgrade-panic-20545
branch
2 times, most recently
from
98788c7 to
600d580
Compare
danxmoran
commented
Jan 19, 2021
|
|
||
| // This command is executed multiple times by test code. Initialization can happen only once. |
There was a problem hiding this comment.
The upgrade process doesn't use flux, I think this was bad copy-pasta
danxmoran
force-pushed
the
dm-fix-upgrade-panic-20545
branch
from
600d580 to
15ac25d
Compare
danxmoran
commented
Jan 19, 2021
| @@ -361,8 +361,9 @@ func runUpgradeE(cmd *cobra.Command, options *options, verbose bool) error { | |||
| } | |||
| } | |||
|
|
|||
| var v1Config *configV1 | |||
| v1Config := &configV1{} | |||
There was a problem hiding this comment.
This (making sure v1Config isn't nil) is the fix for the panic
There was a problem hiding this comment.
The panic was occurring on this line (nil dereference on !v1Config.Http.AuthEnabled)
danxmoran
force-pushed
the
dm-fix-upgrade-panic-20545
branch
from
a47cf85 to
633d93c
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.
Closes #20545
I reworked our existing e2e test for
influxd upgradeto actually cover the main body of the command.