Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] cluster: set bigger grpc limit for array requests #102

Merged
merged 1 commit into from
Oct 31, 2018
Merged

[18.06] cluster: set bigger grpc limit for array requests #102

merged 1 commit into from
Oct 31, 2018

Conversation

andrewhsu
Copy link

@andrewhsu andrewhsu commented Oct 30, 2018 •
edited

backport:

to address:

git cherry-pick moby@489b8ed

$ git cherry-pick -s -x 489b8eda6674523df8b82a210399b7d2954427d0
[grpc1806 cdabbbf33c] cluster: set bigger grpc limit for array requests
 Author: Tonis Tiigi <tonistiigi@gmail.com>
 Date: Mon Oct 29 17:44:11 2018 -0700
 3 files changed, 13 insertions(+), 5 deletions(-)

no conflicts

@andrewhsu andrewhsu added this to the 18.06.2 milestone Oct 30, 2018
@tonistiigi @andrewhsu
cluster: set bigger grpc limit for array requests
cdabbbf 
4MB client side limit was introduced in vendoring go-grpc#1165 (v1.4.0)
making these requests likely to produce errors

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 489b8ed)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
anshulpundir
anshulpundir approved these changes Oct 30, 2018
View reviewed changes
Copy link

@anshulpundir anshulpundir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

thaJeztah
thaJeztah approved these changes Oct 31, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

ping @cpuguy83

@thaJeztah
Copy link
Member

Also addresses moby#37941. Related: moby#36895 (pull request that brought in the updated grpc version) moby/swarmkit#2774 (tracking issue for looking at the message size)

@cpuguy83
Copy link

LGTM

@andrewhsu andrewhsu merged commit 56ad4cd into docker:18.06 Oct 31, 2018
@nmengin nmengin mentioned this pull request Jul 12, 2019
Merged
@andrewhsu andrewhsu deleted the grpc1806 branch July 12, 2019 21:35
@thaJeztah thaJeztah mentioned this pull request Sep 6, 2019
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Sep 12, 2019
@thaJeztah
bump swarmkit to bbe341867eae1615faf8a702ec05bfe986e73e06 (bump_v19.0…
f7dbee3 
…3 branch)

full diff: moby/swarmkit@4fb9e96...bbe3418

changes included:

- moby/swarmkit#2889 [19.03 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets

Which relates to

- moby#39531 integration-cli: fix swarm tests flakiness
- docker#345 [19.03 backport] integration-cli: fix swarm tests flakiness

And includes backports of

- moby/swarmkit#2808 Fix flaky tests
- moby/swarmkit#2866 Swap gometalinter for golangci-lint
- 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
- moby/swarmkit#2870 Fix update out of sequence

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Sep 12, 2019
Merged
docker-jenkins pushed a commit to docker/docker-ce that referenced this pull request Sep 12, 2019
@thaJeztah
bump swarmkit to bbe341867eae1615faf8a702ec05bfe986e73e06 (bump_v19.0…
e04c04e 
…3 branch)

full diff: moby/swarmkit@4fb9e96...bbe3418

changes included:

- moby/swarmkit#2889 [19.03 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets

Which relates to

- moby/moby#39531 integration-cli: fix swarm tests flakiness
- docker/engine#345 [19.03 backport] integration-cli: fix swarm tests flakiness

And includes backports of

- moby/swarmkit#2808 Fix flaky tests
- moby/swarmkit#2866 Swap gometalinter for golangci-lint
- 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
- moby/swarmkit#2870 Fix update out of sequence

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f7dbee3eeaa1dd218116f85b8f60361acbd5b214
Component: engine
This was referenced Sep 25, 2019
Merged
Merged
@thaJeztah thaJeztah mentioned this pull request Oct 2, 2019
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 9, 2019
@thaJeztah
[18.09] bump SwarmKit 5c86095cef3ff480e69486da50f18fd1b3a0de78 (bump_…
e06f07e 
…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>
docker-jenkins pushed a commit to docker/docker-ce that referenced this pull request Oct 23, 2019
@thaJeztah
[18.09] bump SwarmKit 5c86095cef3ff480e69486da50f18fd1b3a0de78 (bump_…
a7f9149 
…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
@vsenapathy
Copy link

Is this fix back ported to docker 18.06?

@thaJeztah
Copy link
Member

Yes, this is the backport, but if you're still running docker 18.06, I would highly recommend upgrading to a currently maintained version, because docker 18.06 reached EOL over 3 years ago, and will contain unpatched vulnerabilities

@vsenapathy
Copy link

@thaJeztah : So i am on 18.06.1-ce and I am still seeing the issue. is that fixed in some other patch?

@thaJeztah
Copy link
Member

See the milestone; it was included in 18.06.2

@vsenapathy
Copy link

@thaJeztah : Is there documentation for doing docker upgrades from 18.06.01 to 18.06.02 on Amazon linux 2 AMI. Also how can I verify if the fix is there?

@vsenapathy
Copy link

@thaJeztah : How can i verify once i do the upgrade that the fix is there?

@vsenapathy
Copy link

vsenapathy commented Oct 12, 2021 •
edited

@thaJeztah or anyone: is this fix ported to 18.09.9? I am using amazon linux 2 and they dont have 18.06.2. Please let me know

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@anshulpundir anshulpundir anshulpundir approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.06.2
6 participants
@andrewhsu @thaJeztah @cpuguy83 @vsenapathy @anshulpundir @tonistiigi