do not create & store context in runtime vm #4650

pperiyasamy · 2021-03-12T11:03:51Z

Signed-off-by: Periyasamy Palanisamy [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

This PR reuses existing context object and avoids creating a new context object in runtime VM module and storing in its runtimeVM structure.

Which issue(s) this PR fixes:

The runtime VM creates its own context object and store in its structure which shouldn't be done as for crio process should contain only one context object which should be passed across API boundaries.

Fixes #4634

Special notes for your reviewer:

streaming#criAdapter{} needed to store the existing ctx object, is that ok ?

Does this PR introduce a user-facing change?

None

Signed-off-by: Periyasamy Palanisamy <[email protected]>

pperiyasamy · 2021-03-12T11:05:04Z

/cc @fidencio, @JanScheurich

haircommander · 2021-03-12T14:41:48Z

internal/oci/runtime_vm.go

 	go func() {
 		// Create the container
-		if resp, err := r.task.Create(r.ctx, request); err != nil {
+		if resp, err := r.task.Create(namespaces.WithNamespace(context.Background(), namespaces.Default), request); err != nil {


why WithNamespace here but not in other places? also, why aren't we passing the ctx to CreateContainer as well?

yes, missed to replace it with ctx, fixed now.
ctx is updated with Namespace in startRuntimeDaemon, so its not needed anymore in other places. is my understanding right ?

haircommander · 2021-03-12T14:43:20Z

awesome thanks for taking this on @pperiyasamy , you've got a lint issue and I've got one question, but generally it LGTM

pperiyasamy · 2021-03-12T15:45:42Z

internal/oci/runtime_vm.go

 	go func() {
 		// Create the container
-		if resp, err := r.task.Create(r.ctx, request); err != nil {
+		if resp, err := r.task.Create(namespaces.WithNamespace(context.Background(), namespaces.Default), request); err != nil {


yes, missed to replace it with ctx, fixed now.
ctx is updated with Namespace in startRuntimeDaemon, so its not needed anymore in other places. is my understanding right ?

pperiyasamy · 2021-03-12T15:52:16Z

server/streaming/streaming.go

 type Runtime interface {
-	Exec(containerID string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error
-	Attach(containerID string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error
+	Exec(ctx context.Context, containerID string, cmd []string, in io.Reader, out, err io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error


while fixing lint in suite_test.go, this change has a compatibility issue with kubelet interface https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cri/streaming/server.go#L63 as it doesn't pass ctx object, how would like to fix this ?

damn yeah we'll have to drop them here and store them for this...

pperiyasamy · 2021-03-12T15:52:55Z

server/streaming/streaming.go

 // criAdapter wraps the Runtime functions to conform to the remotecommand interfaces.
 // The adapter binds the container ID to the container name argument, and the pod sandbox ID to the pod name.
 type criAdapter struct {
+	ctx context.Context


@haircommander is it ok to store ctx here ?

yeah I think we're going to have to. do we create a criAdapter for each new request or for each runtime?

Signed-off-by: Periyasamy Palanisamy <[email protected]>

TomSweeneyRedHat · 2021-03-15T13:22:43Z

LGTM
assuming happy tests.

haircommander · 2021-03-15T13:27:55Z

/approve

LGTM, thanks @pperiyasamy !

Signed-off-by: Periyasamy Palanisamy <[email protected]>

openshift-ci-robot · 2021-03-15T15:26:53Z

@pperiyasamy: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/kata-jenkins	`0f70874`	link	`/test kata-containers`

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-ci · 2021-03-15T15:44:21Z

@pperiyasamy: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2	`0f70874`	link	`/test integration_cgroupv2`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

codecov · 2021-03-15T15:57:07Z

Codecov Report

Merging #4650 (5173eb0) into master (6718405) will increase coverage by 0.03%.
The diff coverage is 6.52%.

@@            Coverage Diff             @@
##           master    #4650      +/-   ##
==========================================
+ Coverage   40.92%   40.95%   +0.03%     
==========================================
  Files         110      110              
  Lines        9545     9545              
==========================================
+ Hits         3906     3909       +3     
+ Misses       5192     5189       -3     
  Partials      447      447

haircommander · 2021-03-15T16:35:15Z

/override ci/kata-jenkins

openshift-ci-robot · 2021-03-15T16:35:19Z

@haircommander: Overrode contexts on behalf of haircommander: ci/kata-jenkins

Details

In response to this:

/override ci/kata-jenkins

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

haircommander · 2021-03-15T16:58:32Z

@mrunalp @saschagrunert @umohnani8 @kolyshkin @giuseppe @QiWang19 PTAL

fidencio · 2021-03-15T20:02:49Z

@pperiyasamy, thanks a lot for the PR. Codewise it looks good to me.

One thing I'd like to ask you for is, could you squash those 3 commits into a single one? The reason I'm asking for this is, when we end up bisecting something, we don't end up in a commit breaking the tests, leaving us without knowing whether the commit is the reason of the breakage we're debugging, or just something that had a fix pushed apart.

saschagrunert

/lgtm

openshift-ci-robot · 2021-03-16T08:30:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, pperiyasamy, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [haircommander,saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

fidencio · 2021-03-16T08:58:22Z

/hold

fidencio · 2021-03-16T08:59:24Z

@saschagrunert, sorry, I'm holding this one till we have all patches squashed. Once we have that, I'll proceed with the /lgtm.

fidencio · 2021-03-16T10:11:08Z

/unhold

fidencio · 2021-03-16T10:11:27Z

@saschagrunert taught me a nice trick: /label tide/merge-method-squash, let's see if it works. :-)

fidencio · 2021-03-16T10:11:36Z

/label tide/merge-method-squash

fidencio · 2021-03-16T10:12:06Z

oh, too late it seems. :-)

We now partially revert cri-o#4650 to still use the runtime internal context for its tasks. Fixes: cri-o#4798 Signed-off-by: Sascha Grunert <[email protected]>

cri-o#4803 partially reverted cri-o#4650, but ended up missing two places where the context is used to ensure the goroutines are stopped. This was caught due to some tests failing in a non deterministic manner on kata-containers CI. Related: cri-o#4798

cri-o#4803 partially reverted cri-o#4650, but ended up missing two places where the context is used to ensure the goroutines are stopped. This was caught due to some tests failing in a non deterministic manner on kata-containers CI. Related: cri-o#4798 Signed-off-by: Fabiano Fidêncio <[email protected]>

cri-o#4803 partially reverted cri-o#4650, but ended up missing two places where the context is used to ensure the goroutines are stopped. This was caught due to some tests failing in a non deterministic manner on kata-containers CI. Related: - cri-o#4798 - kata-containers/tests#3503 (comment) Signed-off-by: Fabiano Fidêncio <[email protected]>

cri-o#4803 partially reverted cri-o#4650, but ended up missing two places where the context is used to ensure the goroutines are stopped. This was caught due to some tests failing in a non deterministic manner on kata-containers CI. Related: - cri-o#4798 - kata-containers/tests#3503 (comment) Signed-off-by: Fabiano Fidêncio <[email protected]> (cherry picked from commit db280b4)

do not store context in runtime vm

7b9bf2e

Signed-off-by: Periyasamy Palanisamy <[email protected]>

pperiyasamy requested review from mrunalp and runcom as code owners March 12, 2021 11:03

openshift-ci-robot requested review from sameo and vrothberg March 12, 2021 11:03

openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 12, 2021

haircommander reviewed Mar 12, 2021

View reviewed changes

openshift-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 12, 2021

pperiyasamy commented Mar 12, 2021

View reviewed changes

fix lint issues

1bf8f82

Signed-off-by: Periyasamy Palanisamy <[email protected]>

pperiyasamy force-pushed the vm-no-context branch from 108dbaa to 1bf8f82 Compare March 15, 2021 11:05

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 15, 2021

fix mock issues

0f70874

Signed-off-by: Periyasamy Palanisamy <[email protected]>

haircommander mentioned this pull request Mar 15, 2021

use internal logging package where appropriate #4660

Closed

saschagrunert approved these changes Mar 16, 2021

View reviewed changes

openshift-ci-robot assigned saschagrunert Mar 16, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2021

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 16, 2021

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 16, 2021

openshift-merge-robot merged commit 1e86661 into cri-o:master Mar 16, 2021

openshift-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Mar 16, 2021

fidencio mentioned this pull request Apr 23, 2021

area/vm: pods are not reaching "completed" state #4798

Closed

saschagrunert mentioned this pull request Apr 26, 2021

Use extra context for runtime VM #4803

Merged

fidencio mentioned this pull request May 7, 2021

runtimeVM: Use internal context to ensure goroutines are stopped #4879

Merged

This was referenced May 11, 2021

release-1.21 | runtimeVM: Use internal context to ensure goroutines are stopped #4890

Merged

Container doesn't reach "Created" status #4906

Closed

do not create & store context in runtime vm #4650

do not create & store context in runtime vm #4650

Uh oh!

Conversation

pperiyasamy commented Mar 12, 2021 • edited by haircommander Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

pperiyasamy commented Mar 12, 2021

Uh oh!

haircommander Mar 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pperiyasamy Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

haircommander commented Mar 12, 2021

Uh oh!

pperiyasamy Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

pperiyasamy Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

haircommander Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

pperiyasamy Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

haircommander Mar 12, 2021

Choose a reason for hiding this comment

Uh oh!

TomSweeneyRedHat commented Mar 15, 2021

Uh oh!

haircommander commented Mar 15, 2021

Uh oh!

openshift-ci-robot commented Mar 15, 2021

Uh oh!

openshift-ci bot commented Mar 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 15, 2021

Codecov Report

Uh oh!

haircommander commented Mar 15, 2021

Uh oh!

openshift-ci-robot commented Mar 15, 2021

Uh oh!

haircommander commented Mar 15, 2021

Uh oh!

fidencio commented Mar 15, 2021

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

fidencio commented Mar 16, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

pperiyasamy commented Mar 12, 2021 •

edited by haircommander

Loading

haircommander Mar 12, 2021 •

edited

Loading

openshift-ci bot commented Mar 15, 2021 •

edited

Loading