Fix the data model inconsistency that breaks upgrade to 1.14-dev#1620
Fix the data model inconsistency that breaks upgrade to 1.14-dev#1620mavenugo merged 1 commit intomoby:masterfrom
Conversation
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
|
LGTM |
|
@mavenugo PTAL. We need this in docker master to fix the upgrade case. |
|
@sanimej the Changes LGTM. But I have a question wrt upgrades from current 1.14.0-dev HEAD -> a docker version after this patch. Will it break such an upgrade (since ExtDNS has again gone back to slice of string). The only legitimate reason we have to be worried about is the Docker-for-mac/windows beta channel which could have been released from master. Can you pls confirm ? |
|
@mavenugo Yes, upgrade from current 1.14.0-dev HEAD to a newer master HEAD may not work. But 1.14.0-dev is an active development branch now. We shouldn't be releasing from the HEAD of a development branch. If it was done it has to be updated to a version with the fix. |
|
@justincormack can you pls confirm if this will cause any harm for D4mac ? |
|
We don't currently release any versions based on docker master other than
for internal testing, so this should be fine.
…On 23 Jan 2017 19:57, "Madhu Venugopal" ***@***.***> wrote:
@justincormack <https://github.com/justincormack> can you pls confirm if
this will cause any harm for D4mac ?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1620 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAdcPPggcJgTk7Lav-9ckGq3jscPnOYtks5rVQYogaJpZM4LosY1>
.
|
|
Thanks @justincormack . LGTM |
|
@sanimej when will this be vendored in to docker master ? |
… to 1.14-dev Upstream reference: moby/libnetwork#1620 Fix https://bugzilla.redhat.com/show_bug.cgi?id=1464790 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
4 participants
#1595 introduced a change to the sandbox state that is persisted in boltdb. This results in container start failing when upgrading from 1.12.x to 1.14-dev. This error is seen on task/container start..
This PR adds the required reconciliation to handle the data model change between the versions. Verified that 1.12.x to 1.14-dev and also 1.14-dev to 1.12 works (downgrade not supported in swarm mode though)
Signed-off-by: Santhosh Manohar santhosh@docker.com