Skip to content
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

vendor: bump mountinfo to v0.4.0 #6495

Merged
merged 1 commit into from
Nov 30, 2020
Merged

vendor: bump mountinfo to v0.4.0 #6495

merged 1 commit into from
Nov 30, 2020

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Oct 2, 2020 •
edited
Loading

What does this PR do?

  1. vendor: bump mountinfo to v0.3.1 v0.4.0. The new mountinfo has some naming
    changes (see convert users to new names in mountinfo moby/sys#42), so convert the calling code.
  2. Stop using mountinfo.PidMountInfo as it's going to be deprecated (see mountinfo: deprecate PidMountInfo moby/sys#47)

The new mountinfo has some naming changes, so convert the calling code.

Update: bumped to v0.4.0.
Update: removed the second commit (obsoleted by 24a6fd3).

Motivation

I am a mountinfo maintainer and I don't like that my changes
break others' software.

Additional Notes

n/a

Describe your test plan

I wholeheartedly rely on your CI.

@kolyshkin kolyshkin requested a review from a team as a code owner October 2, 2020 01:44
@bits-bot
Copy link
Collaborator

bits-bot commented Oct 2, 2020 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@kolyshkin kolyshkin mentioned this pull request Oct 2, 2020
Closed
5 tasks
@kolyshkin
Copy link
Contributor Author

@lebauce PTAL

@kolyshkin
Copy link
Contributor Author

ci/circleci: macos_build failure seems to be caused by a network timeout while downloading something.

@kolyshkin
Copy link
Contributor Author

@gbbr PTAL

@kolyshkin
Copy link
Contributor Author

@safchain @lebauce @gbbr PTAL

@kolyshkin kolyshkin changed the title vendor: bump mountinfo to v0.3.1 vendor: bump mountinfo to v0.4.0 Oct 21, 2020
@kolyshkin
Copy link
Contributor Author

Updated PR to use v0.4.0.

@irabinovitch
Copy link
Contributor

@kolyshkin Apologies for the delay here. I'll get some eyes on this tomorrow.

@kolyshkin
Copy link
Contributor Author

Rebased to HEAD to resolve conflicts.

It looks like the second commit here (8e3af4ba0e9550accf8c0be3fde8a26c3b68eece) is obsoleted by 24a6fd3 (which was not available when I was working on this), so removing it.

@kolyshkin
Copy link
Contributor Author

unit test failure seems unrelated:

=== Failed
=== FAIL: pkg/logs/input/file TestScannerTestSuite/TestLifeCycle (unknown)

=== FAIL: pkg/logs/input/file TestScannerTestSuite/TestScannerScanWithLogRotation (unknown)

=== FAIL: pkg/logs/input/file TestScannerTestSuite/TestScannerScanWithLogRotationCopyTruncate (unknown)
    scanner_test.go:164: 
        	Error Trace:	scanner_test.go:164
        	Error:      	Should be true
        	Test:       	TestScannerTestSuite/TestScannerScanWithLogRotationCopyTruncate
coverage: 78.3% of statements
panic: test timed out after 2m0s

@lebauce lebauce added this to the 7.25.0 milestone Nov 5, 2020
@lebauce
Copy link
Contributor

lebauce commented Nov 5, 2020

Sorry for the delay, I completely missed that one. I added the proper labels and retriggered the CI

@lebauce
Copy link
Contributor

lebauce commented Nov 5, 2020

We are releasing a new version of the agent and therefore only merge essential PRs. I'll merge tyours probably next week. Thanks again !

@kolyshkin @safchain
vendor: bump mountinfo to v0.4.0
a47e7c5 
It has some breaking changes, so updated pkg/security/probe
accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@safchain
Copy link
Contributor

I just rebased your PR so that there is no conflict.

@kolyshkin
Copy link
Contributor Author

I just rebased your PR so that there is no conflict.

thanks, LGTM

@safchain safchain merged commit 5da9abc into DataDog:master Nov 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@safchain safchain safchain approved these changes

Assignees
No one assigned
Labels
changelog/no-changelog team/agent-security
Projects
None yet
Milestone
7.25.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@kolyshkin @bits-bot @irabinovitch @lebauce @safchain