Skip to content

libcontainer/apparmor: use sync.Once for AppArmor detection#2852

Merged
AkihiroSuda merged 1 commit intoopencontainers:masterfrom
thaJeztah:apparmor_once
Mar 21, 2021
Merged

libcontainer/apparmor: use sync.Once for AppArmor detection#2852
AkihiroSuda merged 1 commit intoopencontainers:masterfrom
thaJeztah:apparmor_once

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

I recalled I added a similar change in containerd, but didn't upstream it here. Also removing bytes.HasPrefix() in favor of just checking the first character

AkihiroSuda
AkihiroSuda previously approved these changes Mar 15, 2021
Comment thread libcontainer/apparmor/apparmor_linux.go Outdated
)

var (
appArmorSupported bool
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: s/Supported/Enabled/

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Dang! I looked at it and wanted to update, but forgot: done 👍

@kolyshkin
Copy link
Copy Markdown
Contributor

A nit, LGTM otherwise

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@kolyshkin
Copy link
Copy Markdown
Contributor

CI failure is a flake (#2760 (comment)), CI restarted.

Copy link
Copy Markdown
Contributor

@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

@kolyshkin
Copy link
Copy Markdown
Contributor

CI failure

not ok 26 global --debug to --log
# (in test file tests/integration/debug.bats, line 40)
#   `[[ "${output}" == *"child process in init()"* ]]' failed

is a known flake (#2756, should be fixed by #2835).

Restarted CI.

@kolyshkin
Copy link
Copy Markdown
Contributor

This PR appears to be a champion in the amount of unrelated CI failures.

#2861

CI restarted

@thaJeztah
Copy link
Copy Markdown
Member Author

This PR appears to be a champion in the amount of unrelated CI failures.

#2861

CI restarted

I opened this PR to reveal flaky tests 🤣😂

@AkihiroSuda AkihiroSuda merged commit e112c95 into opencontainers:master Mar 21, 2021
@thaJeztah thaJeztah deleted the apparmor_once branch March 21, 2021 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants