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

Update version check after backport #4786

Merged
merged 1 commit into from
Oct 13, 2022

Conversation

andrross
Copy link
Member

Now that the searchable snapshot API change has been backported to 2.x, the version guard has to change from 3.0 to 2.4.

Signed-off-by: Andrew Ross andrross@amazon.com

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.

Now that the searchable snapshot API change has been backported to 2.x,
the version guard has to change from 3.0 to 2.4.

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross marked this pull request as ready for review October 13, 2022 23:21
@andrross andrross requested review from a team and reta as code owners October 13, 2022 23:21
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

kotwanikunal commented Oct 13, 2022

REPRODUCE WITH: ./gradlew ':server:test' --tests "org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests.testQueryFiltering" -Dtests.seed=31AC51DE66176DE -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=nl-BE -Dtests.timezone=America/Boa_Vista -Druntime.java=17

org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests > testQueryFiltering FAILED
    java.lang.AssertionError: 
    Expected: within <10.0> percent of <125.0>
         but: was <111.1025641025641>
        at __randomizedtesting.SeedInfo.seed([31AC51DE66176DE:C77329D1892D88C7]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:964)
        at org.junit.Assert.assertThat(Assert.java:930)
        at org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests.lambda$testQueryFiltering$11(MedianAbsoluteDeviationAggregatorTests.java:154)
        at org.opensearch.search.aggregations.AggregatorTestCase.testCase(AggregatorTestCase.java:619)
        at org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests.testAggregation(MedianAbsoluteDeviationAggregatorTests.java:255)
        at org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests.testAggregation(MedianAbsoluteDeviationAggregatorTests.java:245)
        at org.opensearch.search.aggregations.metrics.MedianAbsoluteDeviationAggregatorTests.testQueryFiltering(MedianAbsoluteDeviationAggregatorTests.java:149)

Created #4789 to track this.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #4786 (5fb2067) into main (6bae823) will increase coverage by 0.12%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #4786      +/-   ##
============================================
+ Coverage     70.71%   70.84%   +0.12%     
- Complexity    57650    57729      +79     
============================================
  Files          4675     4675              
  Lines        276925   276925              
  Branches      40347    40347              
============================================
+ Hits         195837   196179     +342     
+ Misses        64804    64464     -340     
+ Partials      16284    16282       -2     
Impacted Files Coverage Δ
...ster/snapshots/restore/RestoreSnapshotRequest.java 64.52% <0.00%> (+1.70%) ⬆️
...org/opensearch/cluster/routing/RecoverySource.java 67.83% <0.00%> (-0.70%) ⬇️
...search/indices/recovery/RecoveryTargetHandler.java 0.00% <0.00%> (-100.00%) ⬇️
...a/org/opensearch/client/cluster/ProxyModeInfo.java 0.00% <0.00%> (-60.00%) ⬇️
...ch/transport/ReceiveTimeoutTransportException.java 50.00% <0.00%> (-50.00%) ⬇️
.../opensearch/client/indices/CloseIndexResponse.java 42.50% <0.00%> (-48.75%) ⬇️
...pensearch/indices/breaker/CircuitBreakerStats.java 27.77% <0.00%> (-41.67%) ⬇️
...nsearch/index/shard/IndexShardClosedException.java 66.66% <0.00%> (-33.34%) ⬇️
...min/cluster/snapshots/get/GetSnapshotsRequest.java 52.63% <0.00%> (-31.58%) ⬇️
...opensearch/snapshots/SnapshotMissingException.java 28.57% <0.00%> (-28.58%) ⬇️
... and 464 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@kotwanikunal kotwanikunal added the backport 2.x Backport to 2.x branch label Oct 13, 2022
@kotwanikunal kotwanikunal merged commit 5d7d83e into opensearch-project:main Oct 13, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-4786-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5d7d83e5852ab38095ea02a1248ea40b4416cd4b
# Push it to GitHub
git push --set-upstream origin backport/backport-4786-to-2.x
# Go back to the original working tree
cd ../..
# 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-4786-to-2.x.

@andrross andrross deleted the version-check branch October 13, 2022 23:57
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
Now that the searchable snapshot API change has been backported to 2.x,
the version guard has to change from 3.0 to 2.4.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Signed-off-by: Andrew Ross <andrross@amazon.com>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants