config: add omitzero for numeric types #795
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
|
@baude @ashley-cui @mheon @rhatdan @vrothberg PTAL |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
When toml writes the config file it does not use `omitempty` for numeric values instead it requires `omitzero`. [1] The problem is that without this change, `config.Write()` writes ``` [machine] cpus = 0 disk_size = 0 memory = 0 ``` to the user file. Because podman machine system connection add code will do this the config file is broken afterwards. The first vm will be created successfully but after this every other vm will be broken because the cpu, memory and disk size are set to zero. [1] BurntSushi/toml#81 Fixes containers/podman#11824 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
|
I just added a test to prevent regressions. |
|
LGTM, good catch, thanks!! |
|
/lgtm Ack on backport to 3.4, guess we need to start planning a 3.4.1. |
|
/hold cancel |
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.
When toml writes the config file it does not use
omitemptyfor numericvalues instead it requires
omitzero. [1]The problem is that without this change,
config.Write()writesto the user file. Because podman machine system connection add code will
do this the config file is broken afterwards. The first vm will be created
successfully but after this every other vm will be broken because the
cpu, memory and disk size are set to zero.
[1] BurntSushi/toml#81
Fixes containers/podman#11824