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

newstore: removing deprecated files when use new store driver#1575

Merged
teawater merged 3 commits into
kata-containers:masterfrom
WeiZhang555:simplify-persist-api
May 10, 2019
Merged

newstore: removing deprecated files when use new store driver#1575
teawater merged 3 commits into
kata-containers:masterfrom
WeiZhang555:simplify-persist-api

Conversation

@WeiZhang555
Copy link
Copy Markdown
Member

@WeiZhang555 WeiZhang555 commented Apr 23, 2019 •
edited
Loading

Fixes #803

It contains several commits:

  1. Simplify new store API to make the code easier to understand and use.
  2. newstore: remove file "devices.json"

Signed-off-by: Wei Zhang zhangwei555@huawei.com

@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 23, 2019 •
edited
Loading

Second commit is only for test purpose which should be removed before merging.
After we enabled experimental Jenkins job, we don't need the test commit any more.

ping CI team @kata-containers/ci : #883 (comment)

@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 23, 2019

/test

@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from cb3100e to e1edd28 Compare April 24, 2019 08:56
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 24, 2019

/test

@WeiZhang555 WeiZhang555 changed the title Simplify persist api newstore: removing deprecated files when use new store driver Apr 24, 2019
This was referenced Apr 26, 2019
Merged
Merged
@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from e1edd28 to e21b181 Compare April 26, 2019 15:08
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 26, 2019

/test

@WeiZhang555 WeiZhang555 changed the title newstore: removing deprecated files when use new store driver [WIP]newstore: removing deprecated files when use new store driver Apr 29, 2019
@WeiZhang555
persist: simplify persist api
341a988 
Fixes kata-containers#803

Simplify new store API to make the code easier to understand and use.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from 203f7c0 to 63060d1 Compare April 30, 2019 03:55
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 30, 2019

/test

1 similar comment
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented Apr 30, 2019

/test

jodh-intel
jodh-intel reviewed May 2, 2019
View reviewed changes
Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

Thanks @WeiZhang555.

A few initial comments.

Comment thread virtcontainers/api.go Outdated
Comment thread virtcontainers/device/drivers/block.go Outdated
Comment thread virtcontainers/device/manager/manager.go
Comment thread netmon/netmon.go Outdated
gabibeyer
gabibeyer reviewed May 2, 2019
View reviewed changes
Comment thread virtcontainers/persist.go
@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from c84ce63 to 7be0889 Compare May 5, 2019 06:18
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 5, 2019

/test

@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from 7be0889 to fdd0ad6 Compare May 5, 2019 08:24
@WeiZhang555 WeiZhang555 changed the title [WIP]newstore: removing deprecated files when use new store driver newstore: removing deprecated files when use new store driver May 5, 2019
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 5, 2019

/test

@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 6, 2019

ping @chavafg : Can you enable "experimental" in cri-containerd job so that we can test experimental features with K8s test cases? I think cri-containerd+Fedora can cover almost all cases for experimental features.

I can't find how to set the "KATA_EXPERIMENTAL_FEATURES" flag in our Jenkins Jobs, maybe that's because I don't have right permission.

@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from fdd0ad6 to 33d9ef9 Compare May 6, 2019 03:30
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 6, 2019

/test

@jodh-intel @gabibeyer I fixed the CI now, so please take another look at this. Thanks 😄

@WeiZhang555 WeiZhang555 force-pushed the simplify-persist-api branch from 33d9ef9 to 4c19213 Compare May 6, 2019 06:39
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 6, 2019

/test

@WeiZhang555
newstore: remove file "devices.json"
4c19213 
When using experimental feature "newstore", we save and load devices
information from `persist.json` instead of `devices.json`, in such case,
file `devices.json` isn't needed anymore, so remove it.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented May 6, 2019

Hi @WeiZhang555, I've just enabled it in the cri-containerd job and also provided you with correct permissions on Jenkins.

@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 7, 2019

Thanks so much! @chavafg

@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 8, 2019

ping @kata-containers/runtime

jodh-intel
jodh-intel approved these changes May 8, 2019
View reviewed changes
Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

Thanks @WeiZhang555!

lgtm

Comment thread virtcontainers/device/manager/manager.go Outdated
Comment thread virtcontainers/persist.go
Comment thread virtcontainers/api.go Outdated
@WeiZhang555
persist: save/load GuestMemoryHotplugProbe
2970977 
Support saving/loading `GuestMemoryHotplugProbe` from sandbox state.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 9, 2019

/test

Thanks @jodh-intel ! Your comments are addressed.

@gabibeyer
Copy link
Copy Markdown
Contributor

gabibeyer commented May 9, 2019

lgtm!

@teawater
Copy link
Copy Markdown
Member

teawater commented May 10, 2019

jenkins-ci-centos-7-4-q-35 fail:

--- FAIL: TestHostNetworkingRequested (0.01s)
    assertions.go:239: 
                          
	Error Trace:	network_test.go:99
        
	Error:      	Should be true

This is a known issue #1604

@teawater teawater merged commit 5ba0981 into kata-containers:master May 10, 2019
@WeiZhang555 WeiZhang555 deleted the simplify-persist-api branch May 13, 2019 01:45
@WeiZhang555
Copy link
Copy Markdown
Member Author

WeiZhang555 commented May 13, 2019

Thanks @teawater !

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@gabibeyer gabibeyer gabibeyer left review comments

@jodh-intel jodh-intel jodh-intel approved these changes

@teawater teawater teawater approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[RFC] baseline persist data for live-upgrade

5 participants

@WeiZhang555 @chavafg @gabibeyer @teawater @jodh-intel