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

update vendor #2268

Merged
merged 2 commits into from
Mar 30, 2020
Merged

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Mar 24, 2020

Notably, github.com/vishvananda/netlink hadn't been updated since 2015.


Also run make verify-dependencies with Go 1.14.x

Background: #2073 (comment)

@AkihiroSuda
Copy link
Member Author

Travis wasn't triggered?

@AkihiroSuda
Copy link
Member Author

failing

not ok 75 update
# (in test file tests/integration/update.bats, line 121)
#   `[ "$status" -eq 0 ]' failed
# runc list (status=0):
# ID          PID         STATUS      BUNDLE      CREATED     OWNER
# runc list (status=0):
# ID          PID         STATUS      BUNDLE      CREATED     OWNER
# runc list (status=0):
# ID          PID         STATUS      BUNDLE      CREATED     OWNER
# runc spec (status=0):
# 
# runc run -d --console-socket /tmp/console.sock test_update (status=0):
# 
# runc update test_update --cpu-period 900000 (status=0):
# 
# runc update test_update --cpu-quota 600000 (status=0):
# 
# runc update test_update --cpu-share 200 (status=0):
# 
# runc update test_update --cpuset-cpus 1 (status=0):
# 
# runc update test_update --memory 67108864 (status=0):
# 
# runc update test_update --memory 50M (status=0):
# 
# runc update test_update --memory-reservation 33554432 (status=0):
# 
# runc update test_update --memory-swap -1 (status=1):
# Incorrect Usage: flag provided but not defined: -1
# 
# NAME:
#    runc update - update container resource constraints
# 
# USAGE:
#    runc update [command options] <container-id>
# 
# OPTIONS:
#    --resources value, -r value  path to the file containing the resources to update or '-' to read from the standard input
# 
# The accepted format is as follow (unchanged values can be omitted):
# 
# {
#   "memory": {
#     "limit": 0,
#     "reservation": 0,
#     "swap": 0,
#     "kernel": 0,
#     "kernelTCP": 0
#   },
#   "cpu": {
#     "shares": 0,
#     "quota": 0,
#     "period": 0,
#     "realtimeRuntime": 0,
#     "realtimePeriod": 0,
#     "cpus": "",
#     "mems": ""
#   },
#   "blockIO": {
#     "weight": 0
#   }
# }
# 
# Note: if data is to be read from a file or the standard input, all
# other options are ignored.
#    --blkio-weight value        Specifies per cgroup weight, range is from 10 to 1000 (default: 0)
#    --cpu-period value          CPU CFS period to be used for hardcapping (in usecs). 0 to use system default
#    --cpu-quota value           CPU CFS hardcap limit (in usecs). Allowed cpu time in a given period
#    --cpu-share value           CPU shares (relative weight vs. other containers)
#    --cpu-rt-period value       CPU realtime period to be used for hardcapping (in usecs). 0 to use system default
#    --cpu-rt-runtime value      CPU realtime hardcap limit (in usecs). Allowed cpu time in a given period
#    --cpuset-cpus value         CPU(s) to use
#    --cpuset-mems value         Memory node(s) to use
#    --kernel-memory value       Kernel memory limit (in bytes)
#    --kernel-memory-tcp value   Kernel memory limit (in bytes) for tcp buffer
#    --memory value              Memory limit (in bytes)
#    --memory-reservation value  Memory reservation or soft_limit (in bytes)
#    --memory-swap value         Total memory usage (memory + swap); set '-1' to enable unlimited swap
#    --pids-limit value          Maximum number of pids allowed in the container (default: 0)
#    --l3-cache-schema value     The string of Intel RDT/CAT L3 cache schema
#    --mem-bw-schema value       The string of Intel RDT/MBA memory bandwidth schema
#    
# time="2020-03-24T18:53:58Z" level=error msg="flag provided but not defined: -1"
# flag provided but not defined: -1
# runc list (status=0):
# ID            PID         STATUS      BUNDLE             CREATED                          OWNER
# test_update   17740       running     /tmp/busyboxtest   2020-03-24T18:53:57.736578651Z   root
# runc kill test_update KILL (status=0):
# 
# runc delete test_update (status=0):
# 
# runc list (status=0):
# ID          PID         STATUS      BUNDLE      CREATED     OWNER
# runc list (status=0):
# ID          PID         STATUS      BUNDLE      CREATED     OWNER

@AkihiroSuda
Copy link
Member Author

Opened urfave/cli#1092 for reporting the urfave/cli regression in v1.22.2.

@AkihiroSuda AkihiroSuda force-pushed the vendor-20200325 branch 2 times, most recently from 2c621ab to f01c55e Compare March 25, 2020 01:27
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda force-pushed the vendor-20200325 branch 4 times, most recently from 65cbf3b to e0278ec Compare March 27, 2020 19:07
@AkihiroSuda
Copy link
Member Author

rebased, but travis seems dead 😕

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@kolyshkin
Copy link
Contributor

From CI

git status:
...
modified: vendor/modules.txt

This is from make verify-dependencies which Travis runs with go 1.13. Maybe you did it with go 1.14 and there are some differences?

@AkihiroSuda
Copy link
Member Author

Seems we should use Go 1.14 for verifying vendor: #2073 (comment)

switched back to running the vendoring in 1.14. If we vendor with go 1.13, go build will fail on go 1.14, making the tests fil.

Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@iwankgb
Copy link

iwankgb commented Mar 30, 2020

I think that this PR needs to be merged sooner rather then later as it fixes issue that blocks some other changes (#2271, #2276 and #2278) while #2277 contains an alternative fix.

.travis.yml Outdated Show resolved Hide resolved
Background: opencontainers#2073 (comment)

> switched back to running the vendoring in 1.14. If we vendor with go
> 1.13, go build will fail on go 1.14, making the tests fil.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Copy link
Contributor

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

@mrunalp
Copy link
Contributor

mrunalp commented Mar 30, 2020

LGTM

Approved with PullApprove

@mrunalp
Copy link
Contributor

mrunalp commented Mar 30, 2020

@opencontainers/runc-maintainers ptal.

@crosbymichael
Copy link
Member

crosbymichael commented Mar 30, 2020

LGTM

Approved with PullApprove

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants