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

Apply OpenSearchIntegTestCase::featureFlagSettings by default #5940

Merged
merged 1 commit into from
Jan 19, 2023

Conversation

andrross
Copy link
Member

This commit applies any feature flags specified by a child class override of the featureFlagSettings() method by default. The result is that test implementations do not have to manually specify the featureFlagSettings when creating test nodes.

@dreamer-89 @mch2 Does this make sense?

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>
Copy link
Member

@dreamer-89 dreamer-89 left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @andrross for this change. Yes, this change is useful.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross
Copy link
Member Author

Build succeeded, but the scripted failed to get the result from the Jenkins server:

Complete the run, checking results now......
parse error: Invalid numeric literal at line 1, column 7

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.routing.allocation.decider.DiskThresholdDeciderIT.testIndexCreateBlockWhenAllNodesExceededHighWatermark

Copy link
Member

@mch2 mch2 left a comment

Choose a reason for hiding this comment

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

Yep this is a great simplification, thanks @andrross.

@kotwanikunal kotwanikunal added the backport 2.x Backport to 2.x branch label Jan 19, 2023
@kotwanikunal kotwanikunal removed the backport 2.x Backport to 2.x branch label Jan 19, 2023
@kotwanikunal kotwanikunal merged commit 7a511dd into opensearch-project:main Jan 19, 2023
@kotwanikunal kotwanikunal added the backport 2.x Backport to 2.x branch label Jan 19, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-5940-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7a511dd9ac7989d27d0b4aa7a0b0bf43fb36a91a
# Push it to GitHub
git push --set-upstream origin backport/backport-5940-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-5940-to-2.x.

@andrross andrross deleted the feature-flag-test branch January 19, 2023 22:50
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 19, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 19, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 20, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 20, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 20, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 20, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 20, 2023
…arch-project#5940)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
andrross added a commit that referenced this pull request Jan 20, 2023
…#5944)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
kotwanikunal pushed a commit that referenced this pull request Jan 25, 2023
…#5944)

This commit applies any feature flags specified by a child class
override of the featureFlagSettings() method by default. The result is
that test implementations do not have to manually specify the
featureFlagSettings when creating test nodes.

Signed-off-by: Andrew Ross <[email protected]>

Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 7a511dd)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants