Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: handle appKey conflicts #536

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Fix: handle appKey conflicts #536

merged 2 commits into from
Dec 11, 2024

Conversation

dorjesinpo
Copy link
Collaborator

@dorjesinpo dorjesinpo commented Dec 4, 2024

  1. Refactor thread-unsafe mqbi::Storage::loadVirtualStorageDetails call on the cluster thread.
  2. appId is the only key for mqbi::Storage::AppInfos
  3. Workaround for the appKeys conflict (CSL vs. Qlist)

@dorjesinpo dorjesinpo requested a review from a team as a code owner December 4, 2024 20:09
@dorjesinpo dorjesinpo self-assigned this Dec 4, 2024
@dorjesinpo dorjesinpo force-pushed the fix/squeaky-5 branch 2 times, most recently from b3254b6 to 87ab602 Compare December 4, 2024 22:31
@dorjesinpo dorjesinpo added the bug Something isn't working label Dec 4, 2024
@dorjesinpo dorjesinpo assigned kaikulimu and unassigned dorjesinpo Dec 4, 2024
@dorjesinpo dorjesinpo requested a review from kaikulimu December 4, 2024 22:35
@dorjesinpo dorjesinpo changed the title [WIP] Handle appKey conflicts Handle appKey conflicts Dec 4, 2024
@dorjesinpo dorjesinpo changed the title Handle appKey conflicts Fix: handle appKey conflicts Dec 5, 2024
@kaikulimu
Copy link
Collaborator

kaikulimu commented Dec 10, 2024

On the subject of thread-unsafe mqbi::Storage::loadVirtualStorageDetails calls, we need to fix one call inside mqbblp::Cluster::onRecoveryStatusDispatched.

Copy link
Collaborator

@kaikulimu kaikulimu left a comment

Choose a reason for hiding this comment

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

Some comments, and to to fix one call inside mqbblp::Cluster::onRecoveryStatusDispatched.

src/groups/mqb/mqbc/mqbc_storageutil.cpp Outdated Show resolved Hide resolved
src/groups/mqb/mqbc/mqbc_storageutil.h Show resolved Hide resolved
src/groups/mqb/mqbi/mqbi_storage.h Outdated Show resolved Hide resolved
src/groups/mqb/mqbi/mqbi_storage.h Outdated Show resolved Hide resolved
src/groups/mqb/mqbs/mqbs_datastore.h Outdated Show resolved Hide resolved
src/groups/mqb/mqbc/mqbc_storageutil.h Show resolved Hide resolved
src/groups/mqb/mqbc/mqbc_storageutil.h Show resolved Hide resolved
src/groups/mqb/mqbc/mqbc_storageutil.h Show resolved Hide resolved
src/groups/mqb/mqbc/mqbc_storageutil.cpp Outdated Show resolved Hide resolved
@kaikulimu kaikulimu assigned dorjesinpo and unassigned kaikulimu Dec 10, 2024
Signed-off-by: dorjesinpo <[email protected]>
@dorjesinpo
Copy link
Collaborator Author

On the subject of thread-unsafe mqbi::Storage::loadVirtualStorageDetails calls, we need to fix one call inside mqbblp::Cluster::onRecoveryStatusDispatched.

Indeed. I thought, we can leave it as-is for now. Supposedly, d_recoveryStatusCb cannot be concurrent with any add/removeVirtualStorage (please, double-check).
Otherwise, we could do something like Dispatcher::execute followed by Dispatcher::synchronize.

@dorjesinpo dorjesinpo force-pushed the fix/squeaky-5 branch 2 times, most recently from adae77e to c1bbeba Compare December 10, 2024 16:44
Signed-off-by: dorjesinpo <[email protected]>
Copy link

@bmq-oss-ci bmq-oss-ci bot left a comment

Choose a reason for hiding this comment

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

Build 409 of commit 72e9a1c has completed with FAILURE

Copy link
Collaborator

@kaikulimu kaikulimu left a comment

Choose a reason for hiding this comment

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

lgtm

@kaikulimu kaikulimu merged commit fae5ec1 into main Dec 11, 2024
36 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants