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

2.x consistent get interactions #1334

Merged

Conversation

HenryL27
Copy link
Collaborator

Description

Fix issue where getInteractions returned different results in security-enabled and -disabled settings. Also fix a data race in deleteConversation that made that test flaky.

Issues Resolved

#1272

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:16 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:16 — with GitHub Actions Inactive
@HenryL27
Copy link
Collaborator Author

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:33 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:33 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:33 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env September 13, 2023 20:33 — with GitHub Actions Inactive
@codecov
Copy link

codecov bot commented Sep 13, 2023

Codecov Report

Merging #1334 (47abf5e) into 2.x (f5c20fb) will decrease coverage by 0.03%.
Report is 1 commits behind head on 2.x.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.x    #1334      +/-   ##
============================================
- Coverage     79.40%   79.38%   -0.03%     
  Complexity     2269     2269              
============================================
  Files           190      190              
  Lines          9167     9167              
  Branches        906      906              
============================================
- Hits           7279     7277       -2     
- Misses         1478     1479       +1     
- Partials        410      411       +1     
Flag Coverage Δ
ml-commons 79.38% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

@ylwu-amzn ylwu-amzn merged commit 24a629b into opensearch-project:2.x Sep 13, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 13, 2023
* consistent getInteractions response when security/no security

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* fix deletion race condition

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* cleanup

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

---------

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
(cherry picked from commit 24a629b)
ylwu-amzn pushed a commit that referenced this pull request Sep 13, 2023
* consistent getInteractions response when security/no security

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* fix deletion race condition

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* cleanup

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

---------

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
(cherry picked from commit 24a629b)

Co-authored-by: HenryL27 <hmlindeman@yahoo.com>
HenryL27 added a commit to HenryL27/ml-commons that referenced this pull request Oct 3, 2023
* consistent getInteractions response when security/no security

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* fix deletion race condition

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* cleanup

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

---------

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
HenryL27 added a commit to HenryL27/ml-commons that referenced this pull request Oct 3, 2023
* consistent getInteractions response when security/no security

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* fix deletion race condition

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* cleanup

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

---------

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
(cherry picked from commit 24a629b)
Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
HenryL27 added a commit to HenryL27/ml-commons that referenced this pull request Oct 4, 2023
* consistent getInteractions response when security/no security

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* fix deletion race condition

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

* cleanup

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>

---------

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
(cherry picked from commit 24a629b)
Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
dhrubo-os pushed a commit that referenced this pull request Oct 4, 2023
* consistent getInteractions response when security/no security



* fix deletion race condition



* cleanup



---------


(cherry picked from commit 24a629b)

Signed-off-by: HenryL27 <hmlindeman@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants