[1.29] fix: perform autoreg waiting when performing standard autoreg #3463
Conversation
This file contains 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
Move the code that performs the waiting/delay during automatic registration in its own function; this way it can be reused also in other places. This is only a code recfatoring, there is no behaviour changes. (cherry picked from commit 85544b2)
The initial delay when performing the standard autoregistration used to be done directly in rhsmcertd (the C daemon). When the anonymous autoregistration was implemented, since it has to start immediately, that delay in rhsmcertd was dropped in favour of doing it "inline" during the autoregistration. The waiting was added only during the anonymous autoregistration flow and not during the standard autoregistration. Hence, add the autoregistration wait/delay before performing the standard autoregistration, restoring the previous behaviour. (cherry picked from commit 0d27a59)
cnsnyder
requested review from
a team and
jirihnidek
and removed request for
a team
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The initial delay when performing the standard autoregistration used to
be done directly in rhsmcertd (the C daemon). When the anonymous
autoregistration was implemented, since it has to start immediately,
that delay in rhsmcertd was dropped in favour of doing it "inline"
during the autoregistration. The waiting was added only during the
anonymous autoregistration flow and not during the standard
autoregistration.
Hence, add the autoregistration wait/delay before performing the
standard autoregistration, restoring the previous behaviour.
There is a small commit factorizing the code to an helper function.
Backport of PR #3461 to 1.29.