vendor: update govmm to be compatible with qemu 2.8 by flyflypeng · Pull Request #649 · kata-containers/runtime

flyflypeng · 2018-08-25T14:10:13Z

govmm has ExecuteBlockdevAdd() function and ExecuteBlockdevDel() function
doesn't compatible with qemu 2.8,because blockdev-add and x-blockdev-del usages
are different between qemu 2.7 and qemu 2.8

shortlog:

ce070d1 govmm: modify govmm to be compatible with qemu 2.8
0286ff9 qemu/qmp: support hotplug a nic whose qdisc is mq
8515ae4 qmp: Remind users that you must first call ExecuteQMPCapabilities()
21504d3 qemu/qmp: Add netdev_add with chardev support
ed34f61 Add some negative test cases for qmp.go
17cacc7 Add negative test cases for qemu.go

fixes: #637

Signed-off-by: flyflypeng jiangpengfei9@huawei.com

govmm has ExecuteBlockdevAdd() function and ExecuteBlockdevDel() function doesn't compatible with qemu 2.8,because blockdev-add and x-blockdev-del usages are different between qemu 2.7 and qemu 2.8 shortlog: ce070d1 govmm: modify govmm to be compatible with qemu 2.8 0286ff9 qemu/qmp: support hotplug a nic whose qdisc is mq 8515ae4 qmp: Remind users that you must first call ExecuteQMPCapabilities() 21504d3 qemu/qmp: Add netdev_add with chardev support ed34f61 Add some negative test cases for qmp.go 17cacc7 Add negative test cases for qemu.go fixes: kata-containers#637 Signed-off-by: flyflypeng <jiangpengfei9@huawei.com>

opendev-zuul · 2018-08-25T14:15:53Z

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

kata-runsh : NODE_FAILURE

flyflypeng · 2018-08-25T14:18:11Z

Since ExecuteNetPCIDeviceAdd function definition in the govmm has changed , and kata-runtime the compile error is:

../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)

So the code where call this function in the kata-runtime needed to be modified.This change is modified by @caoruidong kata-containers/govmm#41 , so @caoruidong could you modify the kata-runtime to satisfy this changes?

katacontainersbot · 2018-08-25T14:46:22Z

PSS Measurement:
Qemu: 159397 KB
Proxy: 4010 KB
Shim: 8906 KB

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

caoruidong · 2018-08-27T03:49:38Z

Yes, I'll raise a PR. But some code is changed in #611

ghost · 2018-08-27T07:05:32Z

@woshijpf I am sending in a PR adding support for Z by today evening. Can this wait till that gets merged? This way we need to revendor only once. However, I will raise a new PR to incldue my changes if this is urgent for you.

WeiZhang555 · 2018-08-27T07:09:49Z

@ydjainopensource I think it makes sense to update once, unless it takes too long to merge your PR

ghost · 2018-08-27T07:10:01Z

On second thought, just let this go I am still to get the CI running. So merging my PR would take time.

I am running into some issues so might take long for the CI's to be active.

flyflypeng · 2018-08-27T15:44:09Z

Hey @ydjainopensource ~ What do you want to add in https://github.com/intel/govmm/? And I wonder how long would you take to finish merge your PR, if not taks so long ,I think just revendor once together is better.

ghost · 2018-08-28T10:03:46Z

The PR is waiting for review here. Can't say how long it will take

jodh-intel · 2018-08-28T11:18:56Z

The govmm PR has now been reviewed.

devimc · 2018-08-30T13:30:15Z

PR kata-containers/govmm#43 is being reviewed and probably it will need more work/review
can we merge this one to unlock #669 ?

btw @woshijpf you should include the changes suggested by @caoruidong #651 (comment)

flyflypeng · 2018-08-31T03:40:39Z

@devimc @WeiZhang555 Ok, I have merge #651 and update this PR.

opendev-zuul · 2018-08-31T04:08:51Z

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

kata-runsh : RETRY_LIMIT in 5m 05s

katacontainersbot · 2018-08-31T04:11:25Z

PSS Measurement:
Qemu: 167247 KB
Proxy: 4135 KB
Shim: 8833 KB

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

codecov · 2018-08-31T05:57:23Z

Codecov Report

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

@@            Coverage Diff            @@
##             master     #649   +/-   ##
=========================================
  Coverage          ?   65.35%           
=========================================
  Files             ?       85           
  Lines             ?     9879           
  Branches          ?        0           
=========================================
  Hits              ?     6456           
  Misses            ?     2766           
  Partials          ?      657

WeiZhang555 · 2018-08-31T06:19:38Z

LGTM

jshachm · 2018-08-31T06:29:02Z

LGTM

jodh-intel · 2018-08-31T10:40:12Z

lgtm

In order to avoid performance drop caused by qdisc. And align with cold plug codes. Fixes kata-containers#650 Signed-off-by: Ruidong Cao <caoruidong@huawei.com>

sboeuf · 2018-09-12T19:27:30Z

@woshijpf please backport to stable branches.

flyflypeng · 2018-09-13T16:01:05Z

@sboeuf Could you please explain more details about "backport to stable brancher"? I am not familiar with this operation.

sboeuf · 2018-09-13T16:34:55Z

@woshijpf Sure!
So on github.com/kata-containers/runtime repo, we have 3 different branche:

master
stable-1.1
stable-1.2

This current PR has been raised against master, and because it's been merged and it actually fixes a bug, we want to apply the same code to the 2 other branches.
Please create 2 new PRs, but make sure you open them against stable-1.1 and stable-1.2 instead of master.

…mmon-setup CI: Make Travis call common setup

caoruidong mentioned this pull request Aug 27, 2018

Hotplug nics don't support qdisc mq #650

Closed

WeiZhang555 mentioned this pull request Aug 27, 2018

virtcontainers: Make qdisc of hotplug nics mq #651

Closed

WeiZhang555 mentioned this pull request Aug 31, 2018

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

Closed

flyflypeng force-pushed the update-govmm-vendor branch from 47ee66d to 26f912e Compare August 31, 2018 03:51

jshachm approved these changes Aug 31, 2018

View reviewed changes

jodh-intel merged commit 7d5a5a7 into kata-containers:master Aug 31, 2018

flyflypeng deleted the update-govmm-vendor branch August 31, 2018 11:44

virtcontainers: Make qdisc of hotplug nics mq

26f912e

In order to avoid performance drop caused by qdisc. And align with cold plug codes. Fixes kata-containers#650 Signed-off-by: Ruidong Cao <caoruidong@huawei.com>

sboeuf added bug Incorrect behaviour stable-candidate labels Sep 12, 2018

This was referenced Sep 15, 2018

backport: Update govmm compatible with qemu 2.8 #735

Closed

vendor: update govmm to be compatible with qemu 2.8 to stable 1.1 branch #741

Merged

vendor: update govmm to be compatible with qemu 2.8 to stabel 1.2 branch #742

Merged

egernst pushed a commit to egernst/runtime that referenced this pull request Feb 9, 2021

Merge pull request kata-containers#649 from jodh-intel/travis-call-co…

44b84a6

…mmon-setup CI: Make Travis call common setup

Conversation

flyflypeng commented Aug 25, 2018

Uh oh!

opendev-zuul bot commented Aug 25, 2018

Uh oh!

flyflypeng commented Aug 25, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

katacontainersbot commented Aug 25, 2018

Uh oh!

caoruidong commented Aug 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Aug 27, 2018

Uh oh!

WeiZhang555 commented Aug 27, 2018

Uh oh!

ghost commented Aug 27, 2018 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

flyflypeng commented Aug 27, 2018

Uh oh!

ghost commented Aug 28, 2018

Uh oh!

jodh-intel commented Aug 28, 2018

Uh oh!

devimc commented Aug 30, 2018

Uh oh!

flyflypeng commented Aug 31, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

opendev-zuul bot commented Aug 31, 2018

Uh oh!

katacontainersbot commented Aug 31, 2018

Uh oh!

codecov bot commented Aug 31, 2018

Codecov Report

Uh oh!

WeiZhang555 commented Aug 31, 2018 • edited by amshinde Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jshachm commented Aug 31, 2018

Uh oh!

jodh-intel commented Aug 31, 2018 • edited by amshinde Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sboeuf commented Sep 12, 2018

Uh oh!

flyflypeng commented Sep 13, 2018

Uh oh!

sboeuf commented Sep 13, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

flyflypeng commented Aug 25, 2018 •

edited

Loading

caoruidong commented Aug 27, 2018 •

edited

Loading

ghost commented Aug 27, 2018 •

edited by ghost

Loading

flyflypeng commented Aug 31, 2018 •

edited

Loading

WeiZhang555 commented Aug 31, 2018 •

edited by amshinde

Loading

jodh-intel commented Aug 31, 2018 •

edited by amshinde

Loading