Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to golang 1.12.9 #2880

Merged
merged 4 commits into from Aug 20, 2019
Merged

Bump to golang 1.12.9 #2880

merged 4 commits into from Aug 20, 2019

Conversation

thaJeztah
Copy link
Member

Did the bump in two steps, so that I can cherry-pick the intermediate 1.11.13 bump into older branches

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

ping @dperny PTAL

@thaJeztah
Copy link
Member Author

Weird failures; is Go 1.12 truncating strings using an ellipsis?

--- FAIL: TestTemplatedConfig (0.01s)
    getter_test.go:562: 
        	Error Trace:	getter_test.go:562
        	Error:      	Error message not equal:
        	            	expected: "failed to expand templated config templatedconfig: template: expansion:1:13: executing \"expansion\" at <secret \"unknowntarge...>: error calling secret: secret target unknowntarget not found"
        	            	actual  : "failed to expand templated config templatedconfig: template: expansion:1:13: executing \"expansion\" at <secret \"unknowntarget\">: error calling secret: secret target unknowntarget not found"

oh; the reverse actually; it's looking for <secret \"unknowntarge...>, but gets <secret \"unknowntarget\">

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

thaJeztah commented Aug 19, 2019

time="2019-08-19T21:11:05Z" level=debug msg="(*worker).Update" len(assignments)=6
time="2019-08-19T21:11:05Z" level=debug msg="(*worker).reconcileSecrets" len(removedSecrets)=2 len(updatedSecrets)=0
time="2019-08-19T21:11:05Z" level=debug msg="(*worker).reconcileConfigs" len(removedConfigs)=2 len(updatedConfigs)=0
time="2019-08-19T21:11:05Z" level=debug msg="(*worker).reconcileTaskState" len(removedTasks)=2 len(updatedTasks)=0
PASS
time="2019-08-19T21:11:05Z" level=error msg="task manager failed to report status to agent" error="database not open" module=taskmanager service.id= task.id=task-2
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

Relates to golang/go#29388, may need something like moby/moby#39197

@thaJeztah
Copy link
Member Author

@thaJeztah
Copy link
Member Author

interestingly this commit 596e0f9 removed the go routine when starting closemanager, but this commit added it back 6379ef0 (without removing the new goroutine inside closemanager)

```
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>
@codecov
Copy link

codecov bot commented Aug 19, 2019

Codecov Report

Merging #2880 into master will decrease coverage by 0.04%.
The diff coverage is 33.33%.

@@            Coverage Diff             @@
##           master    #2880      +/-   ##
==========================================
- Coverage   62.22%   62.17%   -0.05%     
==========================================
  Files         139      139              
  Lines       22346    22345       -1     
==========================================
- Hits        13904    13893      -11     
- Misses       6962     6969       +7     
- Partials     1480     1483       +3

@dperny
Copy link
Collaborator

dperny commented Aug 20, 2019

thank you based sebastiaan 🙌 💯 🙌

thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 7, 2019
full diff: moby/swarmkit@7dded76...a8bbe7d

changes included:

- moby/swarmkit#2867 Only update non-terminal tasks on node removal
  - related to moby/swarmkit#2806 Fix leaking task resources when nodes are deleted
- moby/swarmkit#2880 Bump to golang 1.12.9
- moby/swarmkit#2886 Bump vendoring to match current docker/docker master
  - regenerates protobufs
- moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
  - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 9, 2019
…v18.09)

full diff: moby/swarmkit@142a737...5c86095

- moby/swarmkit#2892 [18.09 backport] Remove hardcoded IPAM config subnet value for ingress network
    - backport of moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
    - fixes [ENGORC-2651](https://docker.atlassian.net/browse/ENGORC-2651)
- moby/swarmkit#2836 [18.09 backport] Switch to go 1.11
    - backport of moby/swarmkit#2752 Switch to go 1.11
- moby/swarmkit#2901 [18.09 backport] Bump to golang 1.12.9
    - backport of moby/swarmkit#2880 Bump to golang 1.12.9
- moby/swarmkit#2900 [18.09 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets
    - backport of moby/swarmkit#2762 Increased wait time on test utils WaitForCluster and WatchTaskCreate
    - backport of moby/swarmkit#2771 Allow using Configs as CredentialSpecs
        - **second commit only** (attempt to fix weirdly broken tests)
    - backport of moby/swarmkit#2808 Fix flaky tests
    - backport of moby/swarmkit#2866 Swap gometalinter for golangci-lint
    - backport of moby/swarmkit#2869 Increase max recv gRPC message size to initialize connection broker
        - related / similar to moby#38103 / docker#102 cluster: set bigger grpc limit for array requests
        - related / similar to moby#39306 Increase max recv gRPC message size for nodes and secrets
        - fixes moby/swarmkit#2733 Error generated when messages size is too big
    - backport of moby/swarmkit#2870 Fix update out of sequence

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 21, 2019
full diff: moby/swarmkit@7dded76...a8bbe7d

changes included:

- moby/swarmkit#2867 Only update non-terminal tasks on node removal
  - related to moby/swarmkit#2806 Fix leaking task resources when nodes are deleted
- moby/swarmkit#2880 Bump to golang 1.12.9
- moby/swarmkit#2886 Bump vendoring to match current docker/docker master
  - regenerates protobufs
- moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
  - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker/docker-ce that referenced this pull request Oct 23, 2019
…v18.09)

full diff: moby/swarmkit@142a737...5c86095

- moby/swarmkit#2892 [18.09 backport] Remove hardcoded IPAM config subnet value for ingress network
    - backport of moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
    - fixes [ENGORC-2651](https://docker.atlassian.net/browse/ENGORC-2651)
- moby/swarmkit#2836 [18.09 backport] Switch to go 1.11
    - backport of moby/swarmkit#2752 Switch to go 1.11
- moby/swarmkit#2901 [18.09 backport] Bump to golang 1.12.9
    - backport of moby/swarmkit#2880 Bump to golang 1.12.9
- moby/swarmkit#2900 [18.09 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets
    - backport of moby/swarmkit#2762 Increased wait time on test utils WaitForCluster and WatchTaskCreate
    - backport of moby/swarmkit#2771 Allow using Configs as CredentialSpecs
        - **second commit only** (attempt to fix weirdly broken tests)
    - backport of moby/swarmkit#2808 Fix flaky tests
    - backport of moby/swarmkit#2866 Swap gometalinter for golangci-lint
    - backport of moby/swarmkit#2869 Increase max recv gRPC message size to initialize connection broker
        - related / similar to moby/moby#38103 / docker/engine#102 cluster: set bigger grpc limit for array requests
        - related / similar to moby/moby#39306 Increase max recv gRPC message size for nodes and secrets
        - fixes moby/swarmkit#2733 Error generated when messages size is too big
    - backport of moby/swarmkit#2870 Fix update out of sequence

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e06f07ef337ab890f211397d6b408b75a2512dc5
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants