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

Use original process spec for execs #38871

Merged
merged 1 commit into from Mar 25, 2019

Conversation

Projects
None yet
8 participants
@crosbymichael
Copy link
Member

crosbymichael commented Mar 13, 2019

Fixes #38865

Signed-off-by: Michael Crosby crosbymichael@gmail.com

@crosbymichael

This comment has been minimized.

Copy link
Member Author

crosbymichael commented Mar 13, 2019

I have a dream that one day I'll make a PR to this repo and the tests will just pass instead of fail for some stupid reason

@cpuguy83

This comment has been minimized.

Copy link
Contributor

cpuguy83 commented Mar 13, 2019

Definitely seems to be some regressions after the last swarmkit vendor update.

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 13, 2019

this is an odd one; https://jenkins.dockerproject.org/job/Docker-PRs-experimental/44458/console does that use exec (and no permissions because of this change?)

20:44:29 --- FAIL: TestTemplatedSecret (3.06s)
20:44:29     secret_test.go:221: Creating a new daemon
20:44:29     daemon.go:288: [da0323621fe41] waiting for daemon to start
20:44:29     daemon.go:320: [da0323621fe41] daemon started
20:44:29     secret_test.go:391: assertion failed: string "error injecting secret: open /go/src/github.com/docker/docker/bundles/test-integration/da0323621fe41/root/containers/e06dc8932fc969f6a5af2faa0ec942560f1d871ac9d32973318b019efaa569c5/mounts/secrets/wennbwjreg8g23oji16kxoiyj: read-only file system\r\n" does not contain "SERVICE_NAME=svc_TestTemplatedSecret\nthis is a secret\nthis is a config\n"
20:44:29     daemon.go:275: [da0323621fe41] exiting daemon
Show resolved Hide resolved integration/container/exec_test.go Outdated
Show resolved Hide resolved daemon/exec.go Outdated
@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 13, 2019

Error comes from here

if err := ioutil.WriteFile(fPath, secret.Spec.Data, s.File.Mode); err != nil {
return errors.Wrap(err, "error injecting secret")
}

@codecov

This comment has been minimized.

Copy link

codecov bot commented Mar 14, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (master@6daf5ab). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master   #38871   +/-   ##
=========================================
  Coverage          ?   36.89%           
=========================================
  Files             ?      614           
  Lines             ?    45382           
  Branches          ?        0           
=========================================
  Hits              ?    16742           
  Misses            ?    26348           
  Partials          ?     2292
@cpuguy83
Copy link
Contributor

cpuguy83 left a comment

LGTM

@thaJeztah
Copy link
Member

thaJeztah left a comment

LGTM, thanks!

Show resolved Hide resolved integration/container/exec_test.go Outdated
@cpuguy83

This comment has been minimized.

Copy link
Contributor

cpuguy83 commented Mar 15, 2019

:( Looks like some real CI failures.

@Random-Liu

This comment has been minimized.

Copy link

Random-Liu commented Mar 18, 2019

Are we going to get this into docker 18.09.4?

@crosbymichael crosbymichael force-pushed the crosbymichael:exec-spec branch from 9117969 to f265c22 Mar 19, 2019

@crosbymichael

This comment has been minimized.

Copy link
Member Author

crosbymichael commented Mar 19, 2019

Looks like some timeouts on the CI right now

@crosbymichael crosbymichael force-pushed the crosbymichael:exec-spec branch from aa2ced3 to c52483d Mar 21, 2019

Use original process spec for execs
Fixes #38865

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@crosbymichael

This comment has been minimized.

Copy link
Member Author

crosbymichael commented Mar 22, 2019

I think this is good to go now, rs5-process seems to be having some unrelated issues

@thaJeztah
Copy link
Member

thaJeztah left a comment

LGTM, thanks 🤗

@yongtang

This comment has been minimized.

Copy link
Member

yongtang commented Mar 25, 2019

All tests passed 🎉

@yongtang yongtang merged commit 5635c24 into moby:master Mar 25, 2019

8 of 9 checks passed

codecov/patch 0% of diff hit (target 50%)
Details
codecov/project No report found to compare against
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 44576 has succeeded
Details
janky Jenkins build Docker-PRs 53404 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 13780 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 24549 has succeeded
Details
windowsRS5-process Jenkins build Docker-PRs-WoW-RS5-Process 1890 has succeeded
Details
z Jenkins build Docker-PRs-s390x 13683 has succeeded
Details

@crosbymichael crosbymichael deleted the crosbymichael:exec-spec branch Mar 25, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.