Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

vendor: update govmm and agent to support memory update#669

Closed
linzichang wants to merge 1 commit intokata-containers:masterfrom
linzichang:master
Closed

vendor: update govmm and agent to support memory update#669
linzichang wants to merge 1 commit intokata-containers:masterfrom
linzichang:master

Conversation

@linzichang
Copy link
Copy Markdown
Contributor

@linzichang linzichang commented Aug 30, 2018

vendor: update govmm and agent to support memory update
Fixes #671 

To support kata-runtime update memory, need separate CPU/memory in agent grpc handler
and handler query-memory-devices QMP commands in govmm.

1.Implement query-memory-devices QMP commands(govmm).
2.Add "CpuOnly" field to onlineCPUMem grpc request(agent).

govmm Shortlog:
b16291c qemu/qmp: support query-memory-devices qmp command.

agent Shortlog:
74a5364 build: fix make proto error
b1c2ad8 agent: add support for online memory and cpu separately.

Signed-off-by: Zichang Lin <linzichang@huawei.com>
Signed-off-by: Clare Chen <clare.chenhui@huawei.com>

@linzichang
Copy link
Copy Markdown
Contributor Author

Related to #624

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Aug 30, 2018

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

@jodh-intel
Copy link
Copy Markdown

jodh-intel commented Aug 30, 2018

lgtm but build failing. From Travis:

../virtcontainers/qemu.go:862:53: not enough arguments in call to q.qmpMonitorCh.qmp.ExecuteNetPCIDeviceAdd
	have ("context".Context, string, string, string, string, string)
	want ("context".Context, string, string, string, string, string, int)

Approved with PullApprove

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Aug 30, 2018

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Aug 30, 2018

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

@katacontainersbot
Copy link
Copy Markdown
Contributor

PSS Measurement:
Qemu: 165712 KB
Proxy: 4036 KB
Shim: 8818 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003680 KB

@devimc
Copy link
Copy Markdown

devimc commented Aug 30, 2018

@lifupan please take a look #651 (#651 (comment))

cc @caoruidong @woshijpf

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 30, 2018

Codecov Report

Merging #669 into master will increase coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #669      +/-   ##
==========================================
+ Coverage   65.24%   65.32%   +0.08%     
==========================================
  Files          85       85              
  Lines        9846     9846              
==========================================
+ Hits         6424     6432       +8     
+ Misses       2765     2758       -7     
+ Partials      657      656       -1

@linzichang
Copy link
Copy Markdown
Contributor Author

CI is failed. I think there are some problems in CI environment, unrelated to my change.

@caoruidong
Copy link
Copy Markdown
Member

We have a issue track this failure. kata-containers/tests#680

@WeiZhang555
Copy link
Copy Markdown
Member

WeiZhang555 commented Aug 31, 2018

This is duplicate of #649

#649 is updating the govmm, is there any dependency for govmm in this PR? If not I think you can update only the agent

@WeiZhang555 WeiZhang555 added the duplicate Same issue as one already reported label Aug 31, 2018
@katacontainersbot
Copy link
Copy Markdown
Contributor

PSS Measurement:
Qemu: 169567 KB
Proxy: 4243 KB
Shim: 8792 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003448 KB

@linzichang
Copy link
Copy Markdown
Contributor Author

@WeiZhang555 This PR need govmm and agent update. And the govmm update is newly that #649 . Two choose:

  1. Merge vendor: update govmm to be compatible with qemu 2.8 #649 first, then I make a rebase on this PR.
  2. Close vendor: update govmm to be compatible with qemu 2.8 #649 , just merge this PR.

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Aug 31, 2018

Build succeeded (third-party-check pipeline).

@jshachm
Copy link
Copy Markdown
Member

jshachm commented Aug 31, 2018

PLZ rebase this. #649 is just going to be merged~

Besides each commit should be clear enough to point the change. Just update the agent is better.

@jodh-intel
Copy link
Copy Markdown

yep - #649 is now merged so this needs a rebase.

@katacontainersbot
Copy link
Copy Markdown
Contributor

PSS Measurement:
Qemu: 169921 KB
Proxy: 4076 KB
Shim: 8936 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003580 KB

@katacontainersbot
Copy link
Copy Markdown
Contributor

PSS Measurement:
Qemu: 167779 KB
Proxy: 4019 KB
Shim: 8746 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003564 KB

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Sep 3, 2018

Build failed (third-party-check pipeline) integration testing with
OpenStack. For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

Fixes #671

To support kata-runtime update memory, need separate CPU/memory in agent grpc handler
and handler query-memory-devices QMP commands in govmm.

1.Implement query-memory-devices QMP commands(govmm)
2.Add "CpuOnly" field to onlineCPUMem grpc request(agent)

govmm Shortlog:
b16291c qemu/qmp: support query-memory-devices qmp command.

agent Shortlog:
74a5364 build: fix make proto error
b1c2ad8 agent: add support for online memory and cpu separately.

Signed-off-by: Zichang Lin <linzichang@huawei.com>
Signed-off-by: Clare Chen <clare.chenhui@huawei.com>
@katacontainersbot
Copy link
Copy Markdown
Contributor

PSS Measurement:
Qemu: 169621 KB
Proxy: 4131 KB
Shim: 8758 KB

Memory inside container:
Total Memory: 2043464 KB
Free Memory: 2003440 KB

@linzichang
Copy link
Copy Markdown
Contributor Author

Don't merge, #624 need more agent.pb update.

@opendev-zuul
Copy link
Copy Markdown

opendev-zuul bot commented Sep 3, 2018

Build succeeded (third-party-check pipeline).

@caoruidong caoruidong added do-not-merge and removed duplicate Same issue as one already reported labels Sep 3, 2018
@caoruidong
Copy link
Copy Markdown
Member

If so, I think this can be a commit of PR #624

@jodh-intel
Copy link
Copy Markdown

I agree with @caoruidong.

@linzichang
Copy link
Copy Markdown
Contributor Author

Combine this into #624 . Close.

@linzichang linzichang closed this Sep 6, 2018
egernst pushed a commit to egernst/runtime that referenced this pull request Feb 9, 2021
make sure the parent directory exists when opening the resolv.conf
file.

fixes: kata-containers#669

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants