Hi @skaegi. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

/ok-to-test

Build succeeded.

• containerd-build-arm64 : SUCCESS in 5m 59s (non-voting)

Build succeeded.

• containerd-build-arm64 : SUCCESS in 6m 22s (non-voting)

Build succeeded.

• containerd-build-arm64 : SUCCESS in 5m 53s (non-voting)

Looks like you don't have a valid DCO on all commits. It is probably better if you just squash these commits together and make sure it's signed.

Build succeeded.

• containerd-build-arm64 : SUCCESS in 5m 56s (non-voting)

I wasn't sure how to write a unit test that exercised this particular case but did run a manual test to confirm our CI case works by patching docker:20-dind and validating in my environment where the oom_score_adj is 1000.

FROM golang:alpine as build
RUN apk add git make build-base btrfs-progs-dev && \
    go get github.com/containerd/containerd && \
    cd /go/src/github.com/containerd/containerd && \
    git fetch origin pull/4845/head:pr && git checkout pr && \
    make && make install

FROM docker:20-dind
COPY --from=build /usr/local/bin/ctr /usr/local/bin/
COPY --from=build /usr/local/bin/containerd /usr/local/bin/
COPY --from=build /usr/local/bin/containerd-shim /usr/local/bin/
COPY --from=build /usr/local/bin/containerd-shim-runc-v2 /usr/local/bin/

Is there anything more to do here?

The one failing test above seems unrelated and perhaps an intermittent issue??

    --- FAIL: TestSnapshotterSuite/DevMapperUsage (0.86s)
Error:         snapshotter_test.go:141: assertion failed: expression is false: layer2Usage.Size < sizeBytes+256*dmsetup.SectorSize