Thanks to visit codestin.com
Credit goes to github.com

Skip to content

oci: parse stat file instead of using ctime #4146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Sep 4, 2020
Merged

oci: parse stat file instead of using ctime #4146

openshift-merge-robot merged 1 commit into from
Sep 4, 2020

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Aug 31, 2020 •
edited
Loading

Signed-off-by: Peter Hunt [email protected]

What type of PR is this?

/kind bug

What this PR does / why we need it:

as we have seen the ctime of it's proc entry fluctuate, and the process start time (item 22 in /proc/pid/stat)
could be more reliable

this removes superfluous log lines like this:
0e06ea75835a28aee51b37751e51c6a6f4ac5a54fbe5b805d13c9184c075b74b: PID 3240 is running but has start time of 1598893538, whereas the saved start time is 1598893381. PID wrap may have occurred"

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

@openshift-ci-robot openshift-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels Aug 31, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2020
@haircommander haircommander force-pushed the psgo-pid-checking branch 3 times, most recently from 331c377 to b8207b6 Compare August 31, 2020 21:20
@mrunalp
Copy link
Member

mrunalp commented Aug 31, 2020

@kolyshkin ptal

kolyshkin
kolyshkin reviewed Aug 31, 2020
View reviewed changes
@codecov
Copy link

codecov bot commented Aug 31, 2020 •
edited
Loading

Codecov Report

Merging #4146 into master will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4146      +/-   ##
==========================================
+ Coverage   40.76%   40.83%   +0.06%     
==========================================
  Files         111      111              
  Lines        9494     9505      +11     
==========================================
+ Hits         3870     3881      +11     
  Misses       5248     5248              
  Partials      376      376

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Sep 1, 2020

LGTM once Kir's comment is addressed and the tests get happy.

@haircommander haircommander force-pushed the psgo-pid-checking branch 2 times, most recently from c022a16 to 715b765 Compare September 1, 2020 14:30
@haircommander
Copy link
Member Author

haircommander commented Sep 1, 2020

/retest

@haircommander
Copy link
Member Author

haircommander commented Sep 1, 2020

ptal @mrunalp @saschagrunert @kolyshkin @umohnani8

@haircommander
Copy link
Member Author

haircommander commented Sep 1, 2020

/retest

@haircommander
Copy link
Member Author

haircommander commented Sep 1, 2020

/cherry-pick release-1.19

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 1, 2020

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.19 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.19

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 haircommander mentioned this pull request Sep 1, 2020
Merged
@haircommander
Copy link
Member Author

haircommander commented Sep 1, 2020

/retest

kolyshkin
kolyshkin reviewed Sep 2, 2020
View reviewed changes
kolyshkin
kolyshkin reviewed Sep 2, 2020
View reviewed changes
kolyshkin
kolyshkin reviewed Sep 2, 2020
View reviewed changes
@haircommander
Copy link
Member Author

haircommander commented Sep 2, 2020

updated as suggested and added unit tests

@haircommander
Copy link
Member Author

haircommander commented Sep 2, 2020

/retest

@haircommander
Copy link
Member Author

haircommander commented Sep 2, 2020

PTAL @kolyshkin @saschagrunert @mrunalp @umohnani8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 3, 2020

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.19 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.19

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.

kolyshkin
kolyshkin reviewed Sep 3, 2020
View reviewed changes
internal/oci/container.go Outdated
// trim from the beginning to the character after the last space
data = data[iter+1:]
// find the next space
iter = bytes.IndexRune(data, ' ')
Copy link
Collaborator

@kolyshkin kolyshkin Sep 3, 2020

Choose a reason for hiding this comment

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

No need to use IndexRune here as we do not expect any Unicode in the input.

@kolyshkin
Copy link
Collaborator

kolyshkin commented Sep 3, 2020

Looks much better now, just a nit about using bytes.IndexRune() instead of bytes.Index()

@kolyshkin
Copy link
Collaborator

kolyshkin commented Sep 3, 2020

instead of bytes.Index()

or, yet better, bytes.IndexByte()

saschagrunert
saschagrunert approved these changes Sep 3, 2020
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Just a nit, otherwise LGTM

TomSweeneyRedHat
TomSweeneyRedHat reviewed Sep 3, 2020
View reviewed changes
@haircommander
oci: parse stat file instead of using ctime
167fed4 
as we have seen the ctime of it's proc entry fluctuate, and the process start time (item 22 in /proc/pid/stat)
could be more reliable

Signed-off-by: Peter Hunt <[email protected]>
@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Sep 3, 2020

One question
LGTM otherwise

@haircommander
Copy link
Member Author

haircommander commented Sep 3, 2020

/retest

1 similar comment
@haircommander
Copy link
Member Author

haircommander commented Sep 3, 2020

/retest

saschagrunert
saschagrunert approved these changes Sep 3, 2020
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

kolyshkin
kolyshkin approved these changes Sep 3, 2020
View reviewed changes
Copy link
Collaborator

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 3, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kolyshkin, 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

@mrunalp
Copy link
Member

mrunalp commented Sep 3, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 3, 2020
@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

1 similar comment
@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

@haircommander haircommander mentioned this pull request Sep 4, 2020
Merged
@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/test integration_rhel

@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

2 similar comments
@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 4, 2020 •
edited
Loading

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

Test name Commit Details Rerun command
ci/prow/e2e-aws 167fed4 link /test e2e-aws

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.

@haircommander
Copy link
Member Author

haircommander commented Sep 4, 2020

/retest

@openshift-merge-robot openshift-merge-robot merged commit 5cfd2f3 into cri-o:master Sep 4, 2020
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Sep 4, 2020

@haircommander: #4146 failed to apply on top of branch "release-1.19":

Applying: oci: parse stat file instead of using ctime
Using index info to reconstruct a base tree...
M	internal/oci/container.go
M	internal/oci/container_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oci/container_test.go
Auto-merging internal/oci/container.go
CONFLICT (content): Merge conflict in internal/oci/container.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 oci: parse stat file instead of using ctime
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.19

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 haircommander mentioned this pull request Sep 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp left review comments

@saschagrunert saschagrunert saschagrunert approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

@runcom runcom Awaiting requested review from runcom

@sboeuf sboeuf Awaiting requested review from sboeuf

+1 more reviewer

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mrunalp mrunalp

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@haircommander @mrunalp @TomSweeneyRedHat @openshift-cherrypick-robot @kolyshkin @openshift-ci-robot @saschagrunert @openshift-merge-robot