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

[18.09 backport] Bump to golang 1.12.9 #2901

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 25, 2019

built on top of / replaces #2836 [18.09 backport] Switch to go 1.11
closes #2836 [18.09 backport] Switch to go 1.11

backports of:

cherry-picks were clean; no conflicts

# https://github.com/docker/swarmkit/pull/2880 Bump to golang 1.12.9
git cherry-pick -s -S -x \
	be528e80a841ae89e1bd7539201f12c4de496ab3 \
	43fac9c8049f7dd2ae42d87f60d2a88f86f63853 \
	42085d2f8e43a3ed90ed289d3f3ed3de57837100

Whitespace changes are caused by the fact that gofmt from go-1.11
uses a different heuristic as to how to format the file, making
the source code that was OK for go-1.10 causing a warning with
go-1.11.

NOTE this whitespace change makes the gofmt from go-1.10 complain,
so please upgrade your golang.

[v2: regen pb files]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit fd2d7f2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

ping @dperny @kolyshkin PTAL 🤗

@thaJeztah
Copy link
Member Author

oh; actually; just realised that the 18.09 engine is not yet on Go 1.12.x, so let me mark this one as "WIP" so that we can merge the Go 1.11. bump first.

This also looks to be failing; may need a backport of something else;

panic: Log in goroutine after TestWorkerUpdate has completed

goroutine 2289 [running]:
testing.(*common).logDepth(0xc0001da500, 0xc00042ebc0, 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(0xc0001da500, 0xc0003e5998, 0x1, 0x1)
	/usr/local/go/src/testing/testing.go:642 +0x79
github.com/docker/swarmkit/agent.(*mockTaskController).Remove(0xc00025af90, 0x1372d60, 0xc0000b4010, 0xfe04b7, 0x1a91c58)
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker_test.go:604 +0x8e
github.com/docker/swarmkit/agent.reconcileTaskState.func1(0xc0002f3a40)
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker.go:268 +0x145
created by github.com/docker/swarmkit/agent.reconcileTaskState
	/home/circleci/.go_workspace/src/github.com/docker/swarmkit/agent/worker.go:311 +0x1a6f
FAIL	github.com/docker/swarmkit/agent	9.327s
make: *** [coverage] Error 1

@thaJeztah thaJeztah changed the title [18.09 backport] Bump to golang 1.12.9 [WIP][18.09 backport] Bump to golang 1.12.9 Sep 25, 2019
@thaJeztah
Copy link
Member Author

Hm. so the last commit was meant to fix that; apparently that didn't work 🤷‍♂

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit daf8720)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit be528e8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 43fac9c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
```
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>
(cherry picked from commit 42085d2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_golang_1.12.9 branch from 392fe36 to 5cfdd80 Compare September 26, 2019 16:13
@codecov
Copy link

codecov bot commented Sep 30, 2019

Codecov Report

Merging #2901 into bump_v18.09 will increase coverage by 0.08%.
The diff coverage is 37.5%.

@@               Coverage Diff               @@
##           bump_v18.09    #2901      +/-   ##
===============================================
+ Coverage        61.71%   61.79%   +0.08%     
===============================================
  Files              134      134              
  Lines            21870    21869       -1     
===============================================
+ Hits             13496    13513      +17     
+ Misses            6916     6895      -21     
- Partials          1458     1461       +3

@thaJeztah thaJeztah changed the title [WIP][18.09 backport] Bump to golang 1.12.9 [18.09 backport] Bump to golang 1.12.9 Sep 30, 2019
@thaJeztah
Copy link
Member Author

ok, this is green now

@dperny dperny merged commit deb2071 into moby:bump_v18.09 Oct 1, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_bump_golang_1.12.9 branch October 1, 2019 16:33
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-archive#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>
docker-jenkins pushed a commit to docker-archive/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-archive/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.

3 participants