Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/hcsshim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.11.0
Choose a base ref
...
head repository: microsoft/hcsshim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.11.1
Choose a head ref
  • 9 commits
  • 64 files changed
  • 6 contributors

Commits on Sep 20, 2023

  1. [release/0.11] Cherry-pick testing fixes from v0.10.0-rc.9 and update… 

    … containerd version used (#1881)

* update to latest containerd/1.6 tag v1.6.23

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* fix integration test failure (#1799)

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit f5c5797)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* Checkout appropriate containerd ref

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* skip failing test, use gotestsum (#1820)

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* Cleanup tests that are skipped in CI:
Removes TestConvert() from being skipped as corresponding fix made to v1.6.22
Skip TestContainerSymlinkVolumes() tests as it seems to pass only with containerd/1.7

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

---------

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
Co-authored-by: Hamza El-Saawy <84944216+helsaawy@users.noreply.github.com>
    @kiashok @helsaawy
    kiashok and helsaawy authored Sep 20, 2023
    Copy the full SHA
    9c3272e View commit details

  2. Revert "[release/0.11] Cherry-pick testing fixes from v0.10.0-rc.9 an… 

    …d update containerd version used (#1881)" (#1911)

This reverts commit 9c3272e.
    @kiashok
    kiashok authored Sep 20, 2023
    Copy the full SHA
    cba2f73 View commit details

  3. update to latest containerd/1.6 tag v1.6.23 

    Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @kiashok
    kiashok committed Sep 20, 2023
    Copy the full SHA
    7e652d5 View commit details

  4. fix integration test failure (#1799) 

    Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit f5c5797)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @helsaawy @kiashok
    helsaawy authored and kiashok committed Sep 20, 2023
    Copy the full SHA
    623db83 View commit details

  5. Checkout appropriate containerd ref 

    Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @kiashok
    kiashok committed Sep 20, 2023
    Copy the full SHA
    d10bd0b View commit details

  6. skip failing test, use gotestsum (#1820) 

    Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @helsaawy @kiashok
    helsaawy authored and kiashok committed Sep 20, 2023
    Copy the full SHA
    eb50291 View commit details

  7. Cleanup tests that are skipped in CI: 

    Removes TestConvert() from being skipped as corresponding fix made to v1.6.22
Skip TestContainerSymlinkVolumes() tests as it seems to pass only with containerd/1.7

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @kiashok
    kiashok committed Sep 20, 2023
    Copy the full SHA
    134c4a2 View commit details

  8. defaulting to unbuffered reader for dmverity hashing (#1887) 

    Signed-off-by: Seth Hollandsworth <sethho@microsoft.com>
Co-authored-by: ksayid <khalilsayid@microsoft.com>
(cherry picked from commit e7509cc)
Signed-off-by: Maksim An <maksiman@microsoft.com>
    @SethHollandsworth @ksayid @anmaxvl
    2 people authored and anmaxvl committed Sep 20, 2023
    Copy the full SHA
    b497608 View commit details

  9. Fix closing stdin (#1899) 

    Send the modify request even if stdin is nil, let the process handle it

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
(cherry picked from commit 27df1b9)
Signed-off-by: Maksim An <maksiman@microsoft.com>
    @rumpl @anmaxvl
    rumpl authored and anmaxvl committed Sep 20, 2023
    Copy the full SHA
    641f8b8 View commit details
Showing with 1,448 additions and 513 deletions.
  1. +53 −16 .github/workflows/ci.yml
  2. +7 −1 cmd/dmverity-vhd/main.go
  3. +7 −7 go.mod
  4. +14 −9 go.sum
  5. +6 −8 internal/hcs/process.go
  6. +3 −3 test/go.mod
  7. +24 −5 test/go.sum
  8. +0 −1 vendor/github.com/containerd/containerd/filters/filter.go
  9. +0 −1 vendor/github.com/containerd/containerd/filters/parser.go
  10. +4 −4 vendor/github.com/containerd/containerd/filters/quote.go
  11. +51 −0 vendor/github.com/containerd/containerd/log/context.go
  12. +47 −0 vendor/github.com/containerd/containerd/mount/mount.go
  13. +7 −0 vendor/github.com/containerd/containerd/mount/temp.go
  14. +0 −2 vendor/github.com/containerd/containerd/namespaces/store.go
  15. +148 −0 vendor/github.com/containerd/containerd/pkg/atomicfile/file.go
  16. +7 −6 vendor/github.com/containerd/containerd/plugin/context.go
  17. +32 −13 vendor/github.com/containerd/containerd/runtime/v2/shim/shim.go
  18. +2 −2 vendor/github.com/containerd/containerd/runtime/v2/shim/shim_darwin.go
  19. +2 −2 vendor/github.com/containerd/containerd/runtime/v2/shim/shim_freebsd.go
  20. +3 −2 vendor/github.com/containerd/containerd/runtime/v2/shim/shim_linux.go
  21. +1 −1 vendor/github.com/containerd/containerd/runtime/v2/shim/shim_windows.go
  22. +36 −10 vendor/github.com/containerd/containerd/runtime/v2/shim/util.go
  23. +1 −1 vendor/github.com/containerd/containerd/version/version.go
  24. +3 −4 vendor/github.com/containerd/ttrpc/server.go
  25. +51 −7 vendor/github.com/moby/sys/mountinfo/mounted_linux.go
  26. +5 −6 vendor/github.com/moby/sys/mountinfo/mounted_unix.go
  27. +3 −3 vendor/github.com/moby/sys/mountinfo/mountinfo.go
  28. +14 −30 vendor/github.com/moby/sys/mountinfo/mountinfo_bsd.go
  29. +14 −0 vendor/github.com/moby/sys/mountinfo/mountinfo_freebsdlike.go
  30. +11 −0 vendor/github.com/moby/sys/mountinfo/mountinfo_openbsd.go
  31. +2 −2 vendor/github.com/moby/sys/mountinfo/mountinfo_unsupported.go
  32. +9 −0 vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
  33. +1 −1 vendor/github.com/opencontainers/image-spec/specs-go/version.go
  34. +3 −0 vendor/go.etcd.io/bbolt/.gitignore
  35. +0 −18 vendor/go.etcd.io/bbolt/.travis.yml
  36. +49 −22 vendor/go.etcd.io/bbolt/Makefile
  37. +15 −6 vendor/go.etcd.io/bbolt/README.md
  38. +1 −0 vendor/go.etcd.io/bbolt/bolt_arm64.go
  39. +10 −0 vendor/go.etcd.io/bbolt/bolt_loong64.go
  40. +1 −0 vendor/go.etcd.io/bbolt/bolt_mips64x.go
  41. +1 −0 vendor/go.etcd.io/bbolt/bolt_mipsx.go
  42. +1 −0 vendor/go.etcd.io/bbolt/bolt_ppc.go
  43. +1 −0 vendor/go.etcd.io/bbolt/bolt_ppc64.go
  44. +1 −0 vendor/go.etcd.io/bbolt/bolt_ppc64le.go
  45. +1 −0 vendor/go.etcd.io/bbolt/bolt_riscv64.go
  46. +1 −0 vendor/go.etcd.io/bbolt/bolt_s390x.go
  47. +1 −0 vendor/go.etcd.io/bbolt/bolt_unix.go
  48. +1 −0 vendor/go.etcd.io/bbolt/bolt_unix_aix.go
  49. +19 −43 vendor/go.etcd.io/bbolt/bolt_windows.go
  50. +1 −0 vendor/go.etcd.io/bbolt/boltsync_unix.go
  51. +34 −20 vendor/go.etcd.io/bbolt/bucket.go
  52. +7 −2 vendor/go.etcd.io/bbolt/compact.go
  53. +64 −40 vendor/go.etcd.io/bbolt/cursor.go
  54. +154 −25 vendor/go.etcd.io/bbolt/db.go
  55. +2 −6 vendor/go.etcd.io/bbolt/doc.go
  56. +7 −0 vendor/go.etcd.io/bbolt/errors.go
  57. +10 −9 vendor/go.etcd.io/bbolt/freelist.go
  58. +2 −1 vendor/go.etcd.io/bbolt/mlock_unix.go
  59. +1 −1 vendor/go.etcd.io/bbolt/mlock_windows.go
  60. +18 −10 vendor/go.etcd.io/bbolt/node.go
  61. +10 −0 vendor/go.etcd.io/bbolt/page.go
  62. +228 −154 vendor/go.etcd.io/bbolt/tx.go
  63. +226 −0 vendor/go.etcd.io/bbolt/tx_check.go
  64. +10 −9 vendor/modules.txt
69 changes: 53 additions & 16 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -56,19 +56,36 @@ jobs:
- uses: actions/checkout@v3
with:
path: "go/src/github.com/Microsoft/hcsshim"
name: Checkout hcsshim

- name: Get containerd ref
shell: powershell
run: |
$v = go list -m -f '{{ .Version }}' 'github.com/containerd/containerd' 2>&1
if ( $LASTEXITCODE ) {
Write-Output '::error::Could not retrieve containerd version.'
exit $LASTEXITCODE
}
Write-Output "containerd ref is: $v"
"containerd_ref=$v" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
working-directory: go/src/github.com/Microsoft/hcsshim

# Install protoc-gen-gogoctrd in D:\bin
- uses: actions/checkout@v3
with:
repository: containerd/containerd
ref: v1.6.2
path: "containerd"
ref: "${{ env.containerd_ref }}"
name: Checkout containerd

- name: Install protoc-gen-gogoctrd
shell: powershell
run: |
cd containerd
go build ./cmd/protoc-gen-gogoctrd
mkdir D:\bin
mv protoc-gen-gogoctrd.exe D:\bin
# Install protoc in D:\bin
- name: Install protoc
shell: powershell
@@ -77,6 +94,7 @@ jobs:
Expand-Archive -Path protoc.zip -DestinationPath .
mv include go/src/github.com/Microsoft/hcsshim/protobuf
mv bin\protoc.exe D:\bin
- name: Run Protobuild
shell: powershell
run: |
@@ -260,12 +278,27 @@ jobs:
- uses: actions/checkout@v3
with:
path: src/github.com/containerd/containerd
repository: "containerd/containerd"
path: src/github.com/Microsoft/hcsshim
name: Checkout hcsshim

- name: Get containerd ref
shell: powershell
run: |
$v = go list -m -f '{{ .Version }}' 'github.com/containerd/containerd' 2>&1
if ( $LASTEXITCODE ) {
Write-Output '::error::Could not retrieve containerd version.'
exit $LASTEXITCODE
}
Write-Output "containerd ref is: $v"
"containerd_ref=$v" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
working-directory: src/github.com/Microsoft/hcsshim

- uses: actions/checkout@v3
with:
path: src/github.com/Microsoft/hcsshim
path: src/github.com/containerd/containerd
repository: "containerd/containerd"
ref: "${{ env.containerd_ref }}"
name: Checkout containerd

- name: Install crictl
shell: powershell
@@ -283,21 +316,18 @@ jobs:
exit $LASTEXITCODE
}
# needs to be a separate step since terminal reload is required to bring in new env variables and PATH
- name: Upgrade Chocolaty
shell: powershell
run: |
choco upgrade -y chocolatey 2>&1
- name: Install mingw
shell: powershell
run: |
$VerbosePreference = 'Continue'
# dont set $ErrorActionPreference since we want to allow choco install to fail later on
Write-Output '::group::Update chocolaty'
choco upgrade -y chocolatey
Write-Output '::endgroup::'
if ( $LASTEXITCODE ) {
Write-Output '::error::Could not update chocolatey.'
exit $LASTEXITCODE
}
Write-Output 'Install mingw'
# Install sometimes fails when downloading mingw zip from source-forge with:
# "ERROR: The remote file either doesn't exist, is unauthorized, or is forbidden for url"
@@ -314,7 +344,7 @@ jobs:
Sleep -Seconds 60
}
choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 10.2.0
choco install -y --no-progress --stop-on-first-failure --force mingw --allow-downgrade --version 10.3.0
Write-Output '::endgroup::'
if ( -not $LASTEXITCODE ) {
Write-Output "Attempt $i succeeded (exit code: $LASTEXITCODE)"
@@ -328,6 +358,9 @@ jobs:
exit $LASTEXITCODE
}
# verify mingw32-make was installed
Get-Command -CommandType Application -ErrorAction Stop mingw32-make.exe
- name: Build binaries
shell: bash
working-directory: src/github.com/containerd/containerd
@@ -342,11 +375,15 @@ jobs:
run: |
go build -mod vendor -o "${{ github.workspace }}/src/github.com/containerd/containerd/bin/containerd-shim-runhcs-v1.exe" .\cmd\containerd-shim-runhcs-v1
- name: Install gotestsum
run: go install gotest.tools/gotestsum@${{ env.GOTESTSUM_VERSION }}

- name: Run containerd integration tests
shell: bash
working-directory: src/github.com/containerd/containerd
run: |
export EXTRA_TESTFLAGS="-timeout=20m"
export EXTRA_TESTFLAGS='-timeout=20m'
export GOTEST='gotestsum --format=standard-verbose --debug --'
make integration
- name: Run containerd CRI integration tests
@@ -371,7 +408,7 @@ jobs:
# We skip this test here, until a new release of hcsshim is cut and the one in
# containerd is updated. When the shim is updated in containerd, this test will
# also need to be updated and the special case for windows, removed.
FOCUS="[^TestContainerdRestart$]" make cri-integration
FOCUS="[^(TestContainerdRestart|TestContainerSymlinkVolumes)]" make cri-integration
# Enable these tests once the required JobContainer images are updated.
#
8 changes: 7 additions & 1 deletion cmd/dmverity-vhd/main.go
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,13 @@ func fetchImageLayers(ctx *cli.Context) (layers []v1.Layer, err error) {
// if only an image name is provided and not a tag, the default is "latest"
img, err = tarball.ImageFromPath(tarballPath, &imageNameAndTag)
} else if dockerDaemon {
img, err = daemon.Image(ref)
// use the unbuffered opener, the tradeoff being the image will stream as needed
// so it is slower but much more memory efficient
var opts []daemon.Option
opt := daemon.WithUnbufferedOpener()
opts = append(opts, opt)

img, err = daemon.Image(ref, opts...)
} else {
var remoteOpts []remote.Option
if ctx.IsSet(usernameFlag) && ctx.IsSet(passwordFlag) {
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ require (
github.com/cenkalti/backoff/v4 v4.2.0
github.com/containerd/cgroups v1.1.0
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.6.6
github.com/containerd/containerd v1.6.23
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.1.0
github.com/containerd/ttrpc v1.1.2
github.com/containerd/typeurl v1.0.2
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
@@ -29,11 +29,11 @@ require (
github.com/veraison/go-cose v1.0.0-rc.1
github.com/vishvananda/netlink v1.2.1-beta.2
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
go.etcd.io/bbolt v1.3.6
go.etcd.io/bbolt v1.3.7
go.opencensus.io v0.24.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.7.0
google.golang.org/grpc v1.47.0
google.golang.org/grpc v1.50.1
)

require (
@@ -65,9 +65,9 @@ require (
github.com/lestrrat-go/iter v1.0.1 // indirect
github.com/lestrrat-go/option v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
@@ -81,7 +81,7 @@ require (
golang.org/x/net v0.8.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
23 changes: 14 additions & 9 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -211,17 +211,18 @@ github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTV
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
github.com/containerd/containerd v1.6.23 h1:KYJd6UJhKHzwMhiD70iTtSmU+k4565ac22GOTI3AuTA=
github.com/containerd/containerd v1.6.23/go.mod h1:UrQOiyzrLi3n4aezYJbQH6Il+YzTvnHFbEuO3yfDrM4=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
github.com/containerd/continuity v0.2.2 h1:QSqfxcn8c+12slxwu00AtzXrsami0MJb/MQs9lOLHLA=
github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk=
github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@@ -257,8 +258,9 @@ github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDG
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI=
github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
github.com/containerd/ttrpc v1.1.2 h1:4jH6OQDQqjfVD2b5TJS5TxmGuLGmp5WW7KtW2TWOP7c=
github.com/containerd/ttrpc v1.1.2/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
@@ -678,8 +680,8 @@ github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
@@ -702,8 +704,9 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
@@ -767,8 +770,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@@ -991,8 +994,9 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
@@ -1300,6 +1304,7 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1484,8 +1489,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
14 changes: 6 additions & 8 deletions internal/hcs/process.go
View file
Original file line number Diff line number Diff line change
@@ -421,12 +421,6 @@ func (process *Process) CloseStdin(ctx context.Context) (err error) {
return makeProcessError(process, operation, ErrAlreadyClosed, nil)
}

process.stdioLock.Lock()
defer process.stdioLock.Unlock()
if process.stdin == nil {
return nil
}

//HcsModifyProcess request to close stdin will fail if the process has already exited
if !process.stopped() {
modifyRequest := processModifyRequest{
@@ -448,8 +442,12 @@ func (process *Process) CloseStdin(ctx context.Context) (err error) {
}
}

process.stdin.Close()
process.stdin = nil
process.stdioLock.Lock()
defer process.stdioLock.Unlock()
if process.stdin != nil {
process.stdin.Close()
process.stdin = nil
}

return nil
}
6 changes: 3 additions & 3 deletions test/go.mod
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@ require (
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/hcsshim v0.10.0-rc.3
github.com/containerd/cgroups v1.1.0
github.com/containerd/containerd v1.6.12
github.com/containerd/containerd v1.6.23
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.2.1
github.com/containerd/typeurl v1.0.2
github.com/gogo/protobuf v1.3.2
github.com/google/go-containerregistry v0.14.0
github.com/kevpar/cri v1.11.1-0.20220302210600-4c5c347230b2
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc2
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/opencontainers/runtime-tools v0.9.0
github.com/pkg/errors v0.9.1
@@ -67,7 +67,7 @@ require (
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/signal v0.6.0 // indirect
github.com/moby/sys/symlink v0.2.0 // indirect
github.com/open-policy-agent/opa v0.42.2 // indirect
Loading