Skip to content

revert "connhelper: use ssh multiplexing" - #2303

Merged
silvin-lubecki merged 2 commits into
docker:masterfrom
thaJeztah:revert_ssh_mux
Feb 13, 2020
Merged

revert "connhelper: use ssh multiplexing"#2303
silvin-lubecki merged 2 commits into
docker:masterfrom
thaJeztah:revert_ssh_mux

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Jan 30, 2020

Copy link
Copy Markdown
Member

https://ci.docker.com/public/blue/organizations/jenkins/cli/detail/PR-2132/3/pipeline

=== Failed
=== FAIL: e2e/image TestBuildFromContextDirectoryWithTag (0.32s)
build_test.go:37: assertion failed: Command: docker build -t myimage .
ExitCode: 1
Error: exit status 1
Stdout: Sending build context to Docker daemon 4.608kB
Stderr: error during connect: Post http://docker/v1.40/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=%7B%7D&memory=0&memswap=0&networkmode=default&rm=1&shmsize=0&t=myimage&target=&ulimits=null&version=1: command [ssh -o ControlMaster=auto -o ControlPath=/root/.docker/%r@%h:%p -l penguin 172.20.0.2 -- docker system dial-stdio] has exited with exit status 255, please make sure the URL is valid, and Docker 18.09 or later is installed on the remote host: stderr=
Failures:
ExitCode was 1 expected 0
Expected stderr to contain "[NOTHING]"
Expected no error
=== FAIL: e2e/image TestPullWithContentTrustUsesCacheWhenNotaryUnavailable (3.39s)
pull_test.go:51: assertion failed: Command: docker image rm registry:5000/trust-pull-unreachable:latest
ExitCode: 1
Error: exit status 1
Stdout: Stderr: error during connect: Delete http://docker/v1.40/images/registry:5000/trust-pull-unreachable:latest: command [ssh -o ControlMaster=auto -o ControlPath=/root/.docker/%r@%h:%p -l penguin 172.20.0.2 -- docker system dial-stdio] has exited with exit status 255, please make sure the URL is valid, and Docker 18.09 or later is installed on the remote host: stderr=
Failures:
ExitCode was 1 expected 0
Expected no error

This reverts commit 4ecbef4.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This reverts commit c04dd6e.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

ping @tonistiigi@AkihiroSuda PTAL: perhaps you know what's causing the problem but otherwise I think we should revert for now

@thaJeztahthaJeztah changed the title revert "connhelper: use ssh multiplexing"[wip] revert "connhelper: use ssh multiplexing"Jan 30, 2020
@tonistiigi

Copy link
Copy Markdown
Member

@AkihiroSuda Looks like reporting output from the failed ssh helper in that code does not work properly . Not sure if it is in stdout or there is a race on write/read stderr to buffer and program exiting.

@silvin-lubecki

Copy link
Copy Markdown
Contributor

@tonistiigi do you have any new element on that race?

@silvin-lubeckisilvin-lubecki changed the title [wip] revert "connhelper: use ssh multiplexing"revert "connhelper: use ssh multiplexing"Feb 13, 2020
@silvin-lubecki
silvin-lubecki merged commit 88cb93b into docker:masterFeb 13, 2020
@thaJeztah
thaJeztah deleted the revert_ssh_mux branch February 13, 2020 14:15
@thaJeztahthaJeztah added this to the 20.03.0 milestone Feb 19, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

flaky test: TestInstallWithContentTrust flaky test: TestPushWithContentTrustExistingTag

4 participants

@thaJeztah@tonistiigi@silvin-lubecki@GordonTheTurtle