pw_hash: Use JVM-wide mutex to prevent race conditions#1461
Open
seqizz wants to merge 1 commit intopuppetlabs:mainfrom
Open
pw_hash: Use JVM-wide mutex to prevent race conditions#1461seqizz wants to merge 1 commit intopuppetlabs:mainfrom
seqizz wants to merge 1 commit intopuppetlabs:mainfrom
Conversation
seqizz
requested review from
a team,
alexjfisher,
b4ldr,
bastelfreak,
ekohl,
seanmil and
smortex
as code owners
|
|
Native crypt(3) uses a static buffer and is not thread-safe. On puppetserver, multiple JRuby workers share the same JVM, causing intermittent failures when concurrent pw_hash calls corrupt each other's crypt results. This fix uses synchronized block on the Crypt class for JVM-wide locking on JRuby, and a Ruby Mutex for MRI.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
On parallel runs on a single puppetserver (debian bookworm, v: 7.9.5-2+deb12u1) with 8 workers, we randomly get
Error while evaluating a Function Call, system does not support enhanced saltseven though it works most of the time.Additional Context
Apparently this was a race condition, so this is an attempt to add a mutex for not colliding calculations.
Disclaimer: Since I am not a fluent ruby/java person and I realize this is a security-sensitive file to touch; I'd love to see a thorough review from someone more familiar with it. This is just an attempt to share a solution which worked in our environment.
Checklist
puppet apply)