[worker] Fix hbmon_log_last end extension, simplify resmon upsert - #155
Merged
Merged
Conversation
HBLogLastExtend built an invalid query: the IN list was missing its opening parenthesis. Its args slice was also created with length 3*len(l) and then appended to, so 3*len(l) nil values came before the real values. Without the fix, the hbmon_log_last end timestamp was never extended.
ResmonUpdate's ON DUPLICATE KEY UPDATE reassigned svc_id, node_id, vmname and rid. The duplicate can only come from uk_resmon_1, which is made of these columns, so they already match. Drop the redundant assignments.
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
1 participant
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.
Changes
[worker] Fix hbmon_log_last end extension query
HBLogLastExtendbuilt an invalid query: the IN list was missing itsopening parenthesis. Its args slice was also created with length
3*len(l)and then appended to, so3*len(l)nil values came beforethe real values.
Without the fix, the
hbmon_log_last.endtimestamp was never extended.[worker] Don't reassign resmon unique key columns on duplicate
ResmonUpdate'sON DUPLICATE KEY UPDATEreassignedsvc_id,node_id,vmnameandrid. The duplicate can only come fromuk_resmon_1, which is made of these columns, so they already match.The redundant assignments are dropped. No behaviour change.