CA-410001: Check rrdi.rrd to avoid ds duplicate #6449
Merged
Conversation
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
|
@last-genius, what do you think about this? |
last-genius
approved these changes
May 1, 2025
BengangY
force-pushed
the
private/bengangy/CA-410001
branch
from
4c928e8 to
d7c080a
Compare
last-genius
reviewed
May 6, 2025
BengangY
force-pushed
the
private/bengangy/CA-410001
branch
2 times, most recently
from
9c464bf to
08818b1
Compare
lindig
approved these changes
May 6, 2025
|
Does the commit message still match the implementation? |
BengangY
force-pushed
the
private/bengangy/CA-410001
branch
from
08818b1 to
a81be47
Compare
CA-391651 replaced the function `rrd_add_ds` with an unsafe function `rrd_add_ds_unsafe` in `rrdd_monitor.ml`. Although it has checked if the new ds exists in `rrdi.dss`, if a ds exists in `rrdi.rrd` but not in `rrdi.dss`, it leads the ds duplicates twice in `rrdi.rrd` (E.g. when rrdd plugin starts, it loads local rrdd backup file into `rrdi.rrd` but leaves `rrdi.dss` empty). Solution: Filter out `new_enabled_dss` based on `rrdi.rrd` instead of `rrdi.dss`. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
BengangY
force-pushed
the
private/bengangy/CA-410001
branch
from
a81be47 to
6f9a8db
Compare
BengangY
changed the title
Just updated. |
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.
CA-391651 replaced the function
rrd_add_dswith an unsafe functionrrd_add_ds_unsafeinrrdd_monitor.ml. Although it has checked if the newds exists in
rrdi.dss, if a ds exists inrrdi.rrdbut not inrrdi.dss, itleads the ds duplicates twice in
rrdi.rrd(E.g. when rrdd plugin starts,it loads local rrdd backup file into
rrdi.rrdbut leavesrrdi.dssempty).Solution:
Filter out
new_enabled_dssbased onrrdi.rrdinstead ofrrdi.dss.