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

Enable conversation memory feature flags #2095

Merged
merged 6 commits into from
Feb 13, 2024

Conversation

HenryL27
Copy link
Collaborator

Description

Enable feature flags for GA conversation search in 2.12

Issues Resolved

[List any issues this PR will resolve]

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.

Zhangxunmt
Zhangxunmt previously approved these changes Feb 13, 2024
dhrubo-os
dhrubo-os previously approved these changes Feb 13, 2024
@dhrubo-os
Copy link
Collaborator

@HenryL27 integration tests are failing. Could you please take a look at it?

@dhrubo-os dhrubo-os dismissed their stale review February 13, 2024 20:03

integration tests are failing.

@HenryL27
Copy link
Collaborator Author

oh yes. we tested the feature flags. one sec

Comment on lines 141 to 144
Settings settings = Settings.builder().put(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey(), false).build();
when(this.clusterService.getSettings()).thenReturn(settings);
when(this.clusterService.getClusterSettings())
.thenReturn(new ClusterSettings(settings, Set.of(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED)));
Copy link
Collaborator

Choose a reason for hiding this comment

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

This line seems redundant to all the files. Can't we put this in a common file (may be testutil or something) and then invoke this.

Copy link

codecov bot commented Feb 13, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (38566f5) 81.82% compared to head (e1bd813) 81.82%.
Report is 1 commits behind head on main.

Files Patch % Lines
...mon/conversation/ConversationalIndexConstants.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #2095      +/-   ##
============================================
- Coverage     81.82%   81.82%   -0.01%     
+ Complexity     5617     5616       -1     
============================================
  Files           543      543              
  Lines         22810    22810              
  Branches       2339     2339              
============================================
- Hits          18665    18664       -1     
- Misses         3210     3213       +3     
+ Partials        935      933       -2     
Flag Coverage Δ
ml-commons 81.82% <50.00%> (-0.01%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env February 13, 2024 22:23 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env February 13, 2024 22:23 — with GitHub Actions Inactive
@HenryL27 HenryL27 temporarily deployed to ml-commons-cicd-env February 13, 2024 22:23 — with GitHub Actions Inactive
@Zhangxunmt Zhangxunmt merged commit 850c748 into opensearch-project:main Feb 13, 2024
9 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 13, 2024
* Enable conversation memory feature flags

Signed-off-by: HenryL27 <[email protected]>

* amend feature flag tests

Signed-off-by: HenryL27 <[email protected]>

* remove accidentally committed files

Signed-off-by: HenryL27 <[email protected]>

* apply spotless

Signed-off-by: HenryL27 <[email protected]>

* fix final feature disablement test. whoops

Signed-off-by: HenryL27 <[email protected]>

* move common feature disablement code to util class

Signed-off-by: HenryL27 <[email protected]>

---------

Signed-off-by: HenryL27 <[email protected]>
(cherry picked from commit 850c748)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 13, 2024
* Enable conversation memory feature flags

Signed-off-by: HenryL27 <[email protected]>

* amend feature flag tests

Signed-off-by: HenryL27 <[email protected]>

* remove accidentally committed files

Signed-off-by: HenryL27 <[email protected]>

* apply spotless

Signed-off-by: HenryL27 <[email protected]>

* fix final feature disablement test. whoops

Signed-off-by: HenryL27 <[email protected]>

* move common feature disablement code to util class

Signed-off-by: HenryL27 <[email protected]>

---------

Signed-off-by: HenryL27 <[email protected]>
(cherry picked from commit 850c748)
dhrubo-os pushed a commit that referenced this pull request Feb 13, 2024
* Enable conversation memory feature flags

Signed-off-by: HenryL27 <[email protected]>

* amend feature flag tests

Signed-off-by: HenryL27 <[email protected]>

* remove accidentally committed files

Signed-off-by: HenryL27 <[email protected]>

* apply spotless

Signed-off-by: HenryL27 <[email protected]>

* fix final feature disablement test. whoops

Signed-off-by: HenryL27 <[email protected]>

* move common feature disablement code to util class

Signed-off-by: HenryL27 <[email protected]>

---------

Signed-off-by: HenryL27 <[email protected]>
(cherry picked from commit 850c748)

Co-authored-by: HenryL27 <[email protected]>
Zhangxunmt pushed a commit that referenced this pull request Feb 13, 2024
* Enable conversation memory feature flags

Signed-off-by: HenryL27 <[email protected]>

* amend feature flag tests

Signed-off-by: HenryL27 <[email protected]>

* remove accidentally committed files

Signed-off-by: HenryL27 <[email protected]>

* apply spotless

Signed-off-by: HenryL27 <[email protected]>

* fix final feature disablement test. whoops

Signed-off-by: HenryL27 <[email protected]>

* move common feature disablement code to util class

Signed-off-by: HenryL27 <[email protected]>

---------

Signed-off-by: HenryL27 <[email protected]>
(cherry picked from commit 850c748)

Co-authored-by: HenryL27 <[email protected]>
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
* Enable conversation memory feature flags

Signed-off-by: HenryL27 <[email protected]>

* amend feature flag tests

Signed-off-by: HenryL27 <[email protected]>

* remove accidentally committed files

Signed-off-by: HenryL27 <[email protected]>

* apply spotless

Signed-off-by: HenryL27 <[email protected]>

* fix final feature disablement test. whoops

Signed-off-by: HenryL27 <[email protected]>

* move common feature disablement code to util class

Signed-off-by: HenryL27 <[email protected]>

---------

Signed-off-by: HenryL27 <[email protected]>
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