Bug 1820401: daemon: better way to find installed kernel-rt packages on host #1612

sinnykumari · 2020-04-03T10:24:20Z

Initially we were relying on fixed set of kernel-rt
sub-packages which will be installed on the system. This can cause
issues when machine-os-content ships additional kernel-rt
sub-packages.

To solve this, we now query host with
rpm-ostree status --json and look for requested-local-packages
in the 0th index from available deployments list.

Fixes bug - https://bugzilla.redhat.com/show_bug.cgi?id=1820401

sinnykumari · 2020-04-03T10:24:52Z

/hold

openshift-ci-robot · 2020-04-03T13:05:01Z

@sinnykumari: This pull request references Bugzilla bug 1820401, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1820401: daemon: better way to find installed kernel-rt packages on host

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.

sinnykumari · 2020-04-03T13:05:18Z

/hold cancel

pkg/daemon/update.go

runcom · 2020-04-03T13:10:10Z

Just a nit @cgwalters ptal as well if you have some time

/approve

openshift-ci-robot · 2020-04-03T13:14:41Z

@sinnykumari: This pull request references Bugzilla bug 1820401, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1820401: daemon: better way to find installed kernel-rt packages on host

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.

pkg/daemon/update.go

Initially we were relying on fixed set of kernel-rt sub-packages which will be installed on the system. This can cause issues when machine-os-content ships additional kernel-rt sub-packages. To solve this, we now query host with `rpm-ostree status --json` and look for requested-local-packages in the 0th index from available deployments list. Fixes: RHBZ#1820401

cgwalters

Overall this is fine to merge as is if it's fixing CI. But, a few comments that could be done as followup.
Nice work on this!

cgwalters · 2020-04-03T14:06:25Z

pkg/daemon/update.go

+
+	rtRegex := regexp.MustCompile("kernel-rt-.*")
+	for _, localPkg := range rpms.Deployments[0].RequestedLocalPkgs {
+		if rtRegex.MatchString(localPkg) {


This could just be strings.HasPrefix(localPkg, "kernel-rt-"). But fine as is too.

cgwalters · 2020-04-03T14:07:36Z

pkg/daemon/update.go

@@ -50,6 +50,38 @@ const (
 	realtimeKernelType = "realtime"
 )

+// HostInfo contains information of an OSTree based system
+type HostInfo struct {


We already have rpmOstreeState in rpm-ostree.go; would be good to share code there.

sinnykumari · 2020-04-03T14:13:52Z

Thanks Colin for review! Agree with you to unblock the CI test first. Will address the review comments in follow-up PR

sinnykumari · 2020-04-03T14:14:36Z

/retest

sinnykumari · 2020-04-03T14:18:13Z

/retest

sinnykumari · 2020-04-03T14:23:34Z

ugh, these failing ci tests

sinnykumari · 2020-04-03T14:32:52Z

/retest

sinnykumari · 2020-04-03T15:35:47Z

/retest

runcom · 2020-04-03T16:20:35Z

/lgtm

let's address Colin's address in a follow up!

runcom · 2020-04-03T16:20:56Z

maybe...

/lgtm

cgwalters · 2020-04-03T16:21:41Z

/lgtm

openshift-ci-robot · 2020-04-03T16:22:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, runcom, sinnykumari

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [cgwalters,runcom,sinnykumari]

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

openshift-ci-robot · 2020-04-03T16:26:18Z

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	`3c70e22`	link	`/test e2e-aws-scaleup-rhel7`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

runcom · 2020-04-03T16:57:43Z

/skip

sinnykumari · 2020-04-03T17:25:15Z

Checked into live cluster from e2e-gcp-op CI test run, kernelType test went fine. e2-gcp-op test should finish fine

openshift-ci-robot · 2020-04-03T17:56:04Z

@sinnykumari: All pull requests linked via external trackers have merged: openshift/machine-config-operator#1612. Bugzilla bug 1820401 has been moved to the MODIFIED state.

In response to this:

Bug 1820401: daemon: better way to find installed kernel-rt packages on host

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.

… info Make GetBootedDeployment() function from rpm-ostree.go public so that it can be reused. Also update test accordingly. Follow-up from PR openshift#1612

openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 3, 2020

openshift-ci-robot requested review from ashcrow and cgwalters April 3, 2020 10:28

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2020

sinnykumari force-pushed the master branch 2 times, most recently from 35d5999 to 9dd6816 Compare April 3, 2020 13:03

sinnykumari changed the title ~~[WIP] daemon: better way to find installed kernel-rt packages on host~~ Bug 1820401: daemon: better way to find installed kernel-rt packages on host Apr 3, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 3, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 3, 2020

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

runcom reviewed Apr 3, 2020

View reviewed changes

pkg/daemon/update.go Outdated Show resolved Hide resolved

sinnykumari force-pushed the master branch from 9dd6816 to 96fea40 Compare April 3, 2020 13:12

ashcrow reviewed Apr 3, 2020

View reviewed changes

pkg/daemon/update.go Outdated Show resolved Hide resolved

sinnykumari force-pushed the master branch from 96fea40 to 3c70e22 Compare April 3, 2020 14:05

cgwalters approved these changes Apr 3, 2020

View reviewed changes

openshift-ci-robot assigned runcom Apr 3, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2020

openshift-ci-robot assigned cgwalters Apr 3, 2020

openshift-merge-robot merged commit 0ce063b into openshift:master Apr 3, 2020

yuqi-zhang mentioned this pull request Apr 3, 2020

Ignition types.Config (v0s2) to runtime.RawExtension conversion #996

Merged

sinnykumari mentioned this pull request Apr 15, 2020

pkg/daemon: reuse rpm-ostree code to get currently booted CoreOS host info #1656

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1820401: daemon: better way to find installed kernel-rt packages on host #1612

Bug 1820401: daemon: better way to find installed kernel-rt packages on host #1612

sinnykumari commented Apr 3, 2020 •

edited

sinnykumari commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

runcom commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

cgwalters left a comment

cgwalters Apr 3, 2020

cgwalters Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

runcom commented Apr 3, 2020

runcom commented Apr 3, 2020

cgwalters commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020 •

edited

runcom commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

Bug 1820401: daemon: better way to find installed kernel-rt packages on host #1612

Bug 1820401: daemon: better way to find installed kernel-rt packages on host #1612

Conversation

sinnykumari commented Apr 3, 2020 • edited

sinnykumari commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

runcom commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

cgwalters left a comment

Choose a reason for hiding this comment

cgwalters Apr 3, 2020

Choose a reason for hiding this comment

cgwalters Apr 3, 2020

Choose a reason for hiding this comment

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

runcom commented Apr 3, 2020

runcom commented Apr 3, 2020

cgwalters commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020 • edited

runcom commented Apr 3, 2020

sinnykumari commented Apr 3, 2020

openshift-ci-robot commented Apr 3, 2020

sinnykumari commented Apr 3, 2020 •

edited

openshift-ci-robot commented Apr 3, 2020 •

edited