Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: moby/swarmkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7dded76ec532741c1ad9736cd2bb6d6661f0a386
Choose a base ref
...
head repository: moby/swarmkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8bbe7de43b42fc3a8430819ed577e1218dc64aa
Choose a head ref
  • 11 commits
  • 530 files changed
  • 3 contributors

Commits on Jun 24, 2019

  1. Only update non-terminal tasks on node removal. 

    When a node is removed, its tasks are set in state ORPHANED. This does
not need to be done for tasks that are already in a terminal state, and
if all tasks in all states are updated, the size of the transaction may
grow too large to process, and node removal becomes impossible.

This changes to only set non-terminal tasks to state ORPHANED, and
terminal tasks are left alone.

Signed-off-by: Drew Erny <drew.erny@docker.com>
    @dperny
    dperny committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    d5df265 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Merge pull request #2867 from dperny/orphan-fewer-tasks 

    Only update non-terminal tasks on node removal.
    @dperny
    dperny authored Jul 26, 2019
    Configuration menu
    Copy the full SHA
    f1fb59c View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2019

  1. Bump Golang 1.11.13 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    daf8720 View commit details
    Browse the repository at this point in the history

  2. Bump Golang 1.12.9 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    be528e8 View commit details
    Browse the repository at this point in the history

  3. Update tests for new output with Go 1.12 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    43fac9c View commit details
    Browse the repository at this point in the history

  4. YOLO see if this works 

    ```
panic: Log in goroutine after TestWorkerUpdate has completed

goroutine 1175 [running]:
testing.(*common).logDepth(0xc00019a100, 0xc0000396a0, 0x1d, 0x3)
	/usr/local/go/src/testing/testing.go:634 +0x51a
testing.(*common).log(...)
	/usr/local/go/src/testing/testing.go:614
testing.(*common).Log(0xc00019a100, 0xc00006fb00, 0x1, 0x1)
	/usr/local/go/src/testing/testing.go:642 +0x79
github.com/docker/swarmkit/agent.(*mockTaskController).Remove(0xc00020a780, 0x13b6f40, 0xc0000b4010, 0x13b6f40, 0xc0000b4010)
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker_test.go:604 +0x8e
github.com/docker/swarmkit/agent.reconcileTaskState.func1(0xc0004dac60)
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker.go:270 +0x137
created by github.com/docker/swarmkit/agent.reconcileTaskState
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker.go:313 +0x1a6f
FAIL	github.com/docker/swarmkit/agent	4.244s
make: *** [coverage] Error 1
Exited with code 2
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    42085d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Merge pull request #2880 from thaJeztah/bump_golang 

    Bump to golang 1.12.9
    @dperny
    dperny authored Aug 20, 2019
    Configuration menu
    Copy the full SHA
    958d149 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Bump vendoring to match current docker/docker master 

    Updates vendor.conf so that the versions used all match the
corresponding versions in github.com/docker/docker.

Bumping the vendored version of gogo/protobuf required a few changes to
the swarmkit code for generating protos.

Signed-off-by: Drew Erny <drew.erny@docker.com>
    @dperny
    dperny committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    9562ffc View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. Merge pull request #2886 from dperny/bump-vendoring 

    Bump vendoring to match current docker/docker master
    @dperny
    dperny authored Sep 5, 2019
    Configuration menu
    Copy the full SHA
    e0f62d1 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Remove hardcoded IPAM config subnet value for ingress network 

    Fixes: https://docker.atlassian.net/browse/ENGORC-2651

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
    Arko Dasgupta committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    9ccb20b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2890 from arkodg/remove-ingress-hardcoded-subnet 

    Remove hardcoded IPAM config subnet value for ingress network
    @dperny
    dperny authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    a8bbe7d View commit details
    Browse the repository at this point in the history
Loading