Support for rollback config in compose 3.4 #397

alshabib · 2017-07-28T22:24:02Z

- What I did

Built off #360 to provide support for rollback config in compose 3.4. ie.

  deploy:
      replicas: 1
      rollback_config:
        parallelism: 1

- How I did it

Added the key to the schema, regenerated the schema and tied it to existing UpdateConfig type.

- How to verify it

docker stack deploy -c docker-compose.yml yay

with the following stack:

version: '3.4'

services:
  busy:
    image: busybox
    deploy:
      replicas: 1
      rollback_config:
        parallelism: 1
    ports:
      - 80:80

- Description for the changelog
This pull request adds support for rollback configurations to be specified in the YAML stack file. Given that it is build off the aforementioned pull request, it supports also rollback_config.order.

- A picture of a cute animal (not mandatory but encouraged)

codecov-io · 2017-07-28T22:43:44Z

Codecov Report

Merging #397 into master will increase coverage by 0.03%.
The diff coverage is 63.94%.

@@            Coverage Diff             @@
##           master     #397      +/-   ##
==========================================
+ Coverage   46.26%   46.29%   +0.03%     
==========================================
  Files         193      193              
  Lines       16093    16093              
==========================================
+ Hits         7445     7451       +6     
+ Misses       8259     8254       -5     
+ Partials      389      388       -1

alshabib · 2017-07-28T23:07:20Z

Happy to fix the failing test except that I do not understand why it is failing :)

Let me know what I need to do and I'll do it.

akalipetis

I think that you just need to revert the changes in bindata.go and the validate step will be passed. At least, that was the issue for me.

akalipetis · 2017-07-29T08:10:24Z

cli/compose/schema/bindata.go

@@ -87,7 +87,7 @@ func dataConfig_schema_v30Json() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "data/config_schema_v3.0.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}


You should probably revert the changes here, to fix the validate step.

akalipetis · 2017-07-29T08:10:30Z

cli/compose/schema/bindata.go

@@ -107,7 +107,7 @@ func dataConfig_schema_v31Json() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "data/config_schema_v3.1.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}


akalipetis · 2017-07-29T08:10:38Z

cli/compose/schema/bindata.go

@@ -127,7 +127,7 @@ func dataConfig_schema_v32Json() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "data/config_schema_v3.2.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}


akalipetis · 2017-07-29T08:10:42Z

cli/compose/schema/bindata.go

@@ -147,12 +147,12 @@ func dataConfig_schema_v33Json() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "data/config_schema_v3.3.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}


akalipetis · 2017-07-29T08:11:08Z

cli/compose/schema/bindata.go

@@ -167,7 +167,7 @@ func dataConfig_schema_v34Json() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "data/config_schema_v3.4.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}


alshabib · 2017-07-29T15:13:59Z

Ah ok. I just let go-bindata do it's thing, which I assumed to be correct. I may have passed it e wrong options though. Thanks for this, I'll amend soon.

…

On Jul 29, 2017, 01:13 -0700, Antonis Kalipetis ***@***.***>, wrote: @akalipetis commented on this pull request. I think that you just need to revert the changes in bindata.go and the validate step will be passed. At least, that was the issue for me. In cli/compose/schema/bindata.go: > @@ -87,7 +87,7 @@ func dataConfig_schema_v30Json() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.0.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} You should probably revert the changes here, to fix the validate step. In cli/compose/schema/bindata.go: > @@ -107,7 +107,7 @@ func dataConfig_schema_v31Json() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.1.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} Here too In cli/compose/schema/bindata.go: > @@ -127,7 +127,7 @@ func dataConfig_schema_v32Json() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.2.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} Here too In cli/compose/schema/bindata.go: > @@ -147,12 +147,12 @@ func dataConfig_schema_v33Json() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.3.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} Here too In cli/compose/schema/bindata.go: > @@ -167,7 +167,7 @@ func dataConfig_schema_v34Json() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.4.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} Here too — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.

alshabib · 2017-07-29T23:56:05Z

Now it's a code coverage test that fails. Not sure what I need to do, any tips welcome.

akalipetis · 2017-07-30T10:07:37Z

Not sure about the actual rule, but seems like you need at least 50% of your new changes covered. I would advise on adding tests, in the same places I have for my own patch 😄 You can follow the same logic.

alshabib · 2017-07-30T20:19:29Z

Seems like there was a partial outage of some infrastructure used by circle ci. I'll wait for someone to kick of another verification when the infrastructure is back up.

dnephin

Thanks! this is looking good, just need to fix the test failure

dnephin · 2017-07-31T15:41:25Z

cli/compose/convert/service_test.go

+	updateConfig = convertUpdateConfig(&composetypes.UpdateConfig{
+		Parallelism: &parallel,
+	})
+	assert.Equal(t, updateConfig.Parallelism, parallel)


This needs to be &parallel (the test is failing), also the args are inverted, expected should be the second arg, and actual the third:

assert.Equal(t, &parallel, updateConfig.Parallelism)

alshabib · 2017-07-31T17:25:58Z

Just uploaded a patch, forgot to cast and foolishly thought that I had run tests locally before pushing...

not sure why the validate step failed.

vdemeester

LGTM 🐸

thaJeztah · 2017-08-01T20:26:44Z

#360 was merged; can you rebase to get rid of that commit?

Split out a swarmCAOptions struct for options that are shared between the ca and update commands. Change the 'no trust root' message to an error. Add some unit tests. Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

This package is used by Notary. Add a comment to the vendor.conf file to explain what it contains and what it's used for. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

…ity` This adds bash completion for moby/moby#32874. Signed-off-by: Harald Albers <github@albersweb.de>

Cleanup a test Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>

Signed-off-by: khaled souf <khaled.souf@gmail.com>

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

The "until" filter is supported by all object types, except for volumes. Before this patch, the "until" filter would attempted to be used for the volume prune endpoint, resulting in an error being returned by the daemon, and further prune endpoints (networks, images) to be skipped. $ docker system prune --filter until=24h --filter label=label.foo=bar WARNING! This will remove: - all stopped containers - all volumes not used by at least one container - all networks not used by at least one container - all dangling images Are you sure you want to continue? [y/N] y Error response from daemon: Invalid filter 'until' Calling POST /v1.30/containers/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D Calling POST /v1.30/volumes/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D Handler for POST /v1.30/volumes/prune returned error: Invalid filter 'until' Error response from daemon: Invalid filter 'until' With this patch, an error is produced instead, preventing "partial" prune. $ docker system prune --filter until=24h --filter label=foo==bar --volumes ERROR: The "until" filter is not supported with "--volumes" Note that `docker volume prune` does not have this problem, and produces an error if the `until` filter is used; $ docker volume prune --filter until=24h WARNING! This will remove all volumes not used by at least one container. Are you sure you want to continue? [y/N] y Error response from daemon: Invalid filter 'until' Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

…etion Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Fix docker cp dir with hard link, refer to moby/moby#3. Signed-off-by: Shukui Yang <yangshukui@huawei.com>

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Signed-off-by: Liping Xue <lipingxue@gmail.com> Change to enable volume name can be customized. Signed-off-by: Liping Xue <lipingxue@gmail.com> Change to enable volume name can be customized. Remove unused debug info. Address comments from Daniel and solve the lint error. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address Daniel's comments to print warning message when name of external volume is set in loader code. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address Daniel's comments to return error when external volume is set in loader code. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address Daniel's comments to return error when external volume is set in loader code. Signed-off-by: Liping Xue <lipingxue@gmail.com> Remove the case that specifying external volume name in full-example.yml. More fix. Add unit test. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address comments from Daniel, move the schema change to v3.4. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address comments from Sebastiaan. Signed-off-by: Liping Xue <lipingxue@gmail.com> Address comments from Misty. Signed-off-by: Liping Xue <lipingxue@gmail.com>

Signed-off-by: Darren Stahl <darst@microsoft.com>

Since CLI was moved to a separate repo, these references are incorrect. Fixed with the help of sed script, verified manually. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>

Signed-off-by: Ali Al-Shabibi <alshabibi.ali@gmail.com>

alshabib · 2017-08-01T21:48:39Z

Apologies. Managed to rebase the wrong branch on my work. Recreated here -> #409

alshabib requested review from dnephin and vdemeester as code owners July 28, 2017 22:24

GordonTheTurtle added dco/no status/0-triage labels Jul 28, 2017

alshabib force-pushed the order branch from 50ba920 to fb00e66 Compare July 28, 2017 22:43

GordonTheTurtle removed the dco/no label Jul 28, 2017

alshabib force-pushed the order branch from fb00e66 to c2ee139 Compare July 28, 2017 22:55

akalipetis reviewed Jul 29, 2017

View reviewed changes

alshabib force-pushed the order branch from c2ee139 to 4e745bd Compare July 29, 2017 23:36

alshabib force-pushed the order branch from 4e745bd to a3205d1 Compare July 30, 2017 20:14

dnephin reviewed Jul 31, 2017

View reviewed changes

dnephin added status/2-code-review and removed status/0-triage labels Jul 31, 2017

alshabib force-pushed the order branch from a3205d1 to 0abebf3 Compare July 31, 2017 17:21

docker deleted a comment from GordonTheTurtle Aug 1, 2017

vdemeester approved these changes Aug 1, 2017

View reviewed changes

dnephin and others added 6 commits August 1, 2017 14:17

Refactor caCommand

5649d73

Split out a swarmCAOptions struct for options that are shared between the ca and update commands. Change the 'no trust root' message to an error. Add some unit tests. Signed-off-by: Daniel Nephin <dnephin@docker.com>

Clarify that you can use -d and --rm together now

6656c5a

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

Clarify docker/go package

274b216

This package is used by Notary. Add a comment to the vendor.conf file to explain what it contains and what it's used for. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Provide examples for multiple uses of the same flag

ddf4c1c

Signed-off-by: Misty Stanley-Jones <misty@docker.com>

add --detach to docker scale

eb5e273

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

scale all services at once

b630462

Signed-off-by: Victor Vieux <victorvieux@gmail.com>

albers and others added 24 commits August 1, 2017 14:17

Add metric plugins to bash completion for `plugin ls --filter capabil…

a25fce8

…ity` This adds bash completion for moby/moby#32874. Signed-off-by: Harald Albers <github@albersweb.de>

Add myself to command/stack codeowners

6a44844

Cleanup a test Signed-off-by: Daniel Nephin <dnephin@docker.com>

Fix shellcheck on master

8c5ccb3

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Sort services names in a natural order

21d1c59

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>

Bump SwarmKit to 79381d0840be27f8b3f5c667b348a4467d866eeb

831a684

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

bump gRPC to v1.3.0, add genproto, update protobuf

e9ebb80

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

bump golang.org/x/net to 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6

0dddb5a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Update the cp command docs to include archive

87cdb96

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>

adding connect disconnect network tests

1c3150c

Signed-off-by: khaled souf <khaled.souf@gmail.com>

Add zsh completion for system prune --volumes

80be6ef

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Update __docker_get_log_options completion

f0160a3

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Update README and add help target to make

90bbb3f

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Bump version to 17.08.0-dev

dfbae4a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Remove duplicate publish option in docker service create/update compl…

17d263b

…etion Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

fixed word network on volume_ls.md

f760d3f

Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>

Add metric plugins to zsh completion for plugin ls --filter capability

5f1d083

Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>

Vendor, update moby to d58ffa0364c04d03a8f25704d7f0489ee6cd9634

8e9d104

Fix docker cp dir with hard link, refer to moby/moby#3. Signed-off-by: Shukui Yang <yangshukui@huawei.com>

Add Compose format 3.4

000c532

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Fast fail when save directory does not exist

f798196

Signed-off-by: Darren Stahl <darst@microsoft.com>

Fix repo references in docs

dc66129

Since CLI was moved to a separate repo, these references are incorrect. Fixed with the help of sed script, verified manually. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Support the "order" key in "update_config" for compose

faa4f01

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>

Adding support for Rollback config in compose 3.4

468a665

Signed-off-by: Ali Al-Shabibi <alshabibi.ali@gmail.com>

alshabib force-pushed the order branch from 0abebf3 to 468a665 Compare August 1, 2017 21:18

alshabib requested review from mdlinville and thaJeztah as code owners August 1, 2017 21:18

alshabib closed this Aug 1, 2017

alshabib deleted the order branch August 1, 2017 21:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for rollback config in compose 3.4 #397

Support for rollback config in compose 3.4 #397

alshabib commented Jul 28, 2017 •

edited by dnephin

Loading

codecov-io commented Jul 28, 2017 •

edited

Loading

alshabib commented Jul 28, 2017

akalipetis left a comment

akalipetis Jul 29, 2017

akalipetis Jul 29, 2017

akalipetis Jul 29, 2017

akalipetis Jul 29, 2017

akalipetis Jul 29, 2017

alshabib commented Jul 29, 2017 via email

alshabib commented Jul 29, 2017

akalipetis commented Jul 30, 2017

alshabib commented Jul 30, 2017

dnephin left a comment

dnephin Jul 31, 2017

alshabib commented Jul 31, 2017 •

edited

Loading

vdemeester left a comment

thaJeztah commented Aug 1, 2017

alshabib commented Aug 1, 2017

Support for rollback config in compose 3.4 #397

Support for rollback config in compose 3.4 #397

Conversation

alshabib commented Jul 28, 2017 • edited by dnephin Loading

codecov-io commented Jul 28, 2017 • edited Loading

Codecov Report

alshabib commented Jul 28, 2017

akalipetis left a comment

Choose a reason for hiding this comment

akalipetis Jul 29, 2017

Choose a reason for hiding this comment

akalipetis Jul 29, 2017

Choose a reason for hiding this comment

akalipetis Jul 29, 2017

Choose a reason for hiding this comment

akalipetis Jul 29, 2017

Choose a reason for hiding this comment

akalipetis Jul 29, 2017

Choose a reason for hiding this comment

alshabib commented Jul 29, 2017 via email

alshabib commented Jul 29, 2017

akalipetis commented Jul 30, 2017

alshabib commented Jul 30, 2017

dnephin left a comment

Choose a reason for hiding this comment

dnephin Jul 31, 2017

Choose a reason for hiding this comment

alshabib commented Jul 31, 2017 • edited Loading

vdemeester left a comment

Choose a reason for hiding this comment

thaJeztah commented Aug 1, 2017

alshabib commented Aug 1, 2017

alshabib commented Jul 28, 2017 •

edited by dnephin

Loading

codecov-io commented Jul 28, 2017 •

edited

Loading

alshabib commented Jul 31, 2017 •

edited

Loading