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

Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 #8585

Merged
merged 12 commits into from Jul 11, 2023

Conversation

scrawfor99
Copy link
Contributor

Description

Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 since #8579 failed.

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.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: null ❌
  • URL: null
  • CommitID: c92b543
    Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
    Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: null ❌
  • URL: null
  • CommitID: 7b9c6b5
    Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
    Is the failure a flaky test unrelated to your change?

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: null ❌
  • URL: null
  • CommitID: fa5c14e
    Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
    Is the failure a flaky test unrelated to your change?

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@scrawfor99
Copy link
Contributor Author

Flaky tests:

org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnSecondAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnThirdAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnSecondAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnThirdAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnSecondAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnThirdAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnSecondAttempt
org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnThirdAttempt

java.lang.AssertionError: expected:<0> but was:<1>
	at __randomizedtesting.SeedInfo.seed([EC329868F74DF950:F8EB60D17522E01C]:0)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.failNotEquals(Assert.java:835)
	at org.junit.Assert.assertEquals(Assert.java:647)
	at org.junit.Assert.assertEquals(Assert.java:633)
	at org.opensearch.index.shard.RemoteStoreRefreshListenerTests.lambda$testRefreshSuccessOnSecondAttempt$2(RemoteStoreRefreshListenerTests.java:269)
	at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1085)
	at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1058)
	at org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshSuccessOnSecondAttempt(RemoteStoreRefreshListenerTests.java:269)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
	at java.base/java.lang.reflect.Method.invoke(Method.java:578)
	at com.carrotsearch.randomizedtesting.RandomizedRunner.invoke(RandomizedRunner.java:1750)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$8.evaluate(RandomizedRunner.java:938)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$9.evaluate(RandomizedRunner.java:974)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$10.evaluate(RandomizedRunner.java:988)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
	at org.apache.lucene.tests.util.TestRuleSetupTeardownChained$1.evaluate(TestRuleSetupTeardownChained.java:48)
	at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
	at org.apache.lucene.tests.util.TestRuleThreadAndTestName$1.evaluate(TestRuleThreadAndTestName.java:45)
	at org.apache.lucene.tests.util.TestRuleIgnoreAfterMaxFailures$1.evaluate(TestRuleIgnoreAfterMaxFailures.java:60)
	at org.apache.lucene.tests.util.TestRuleMarkFailure$1.evaluate(TestRuleMarkFailure.java:44)
	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at com.carrotsearch.randomizedtesting.ThreadLeakControl$StatementRunner.run(ThreadLeakControl.java:368)
	at com.carrotsearch.randomizedtesting.ThreadLeakControl.forkTimeoutingTask(ThreadLeakControl.java:817)
	at com.carrotsearch.randomizedtesting.ThreadLeakControl$3.evaluate(ThreadLeakControl.java:468)
	at com.carrotsearch.randomizedtesting.RandomizedRunner.runSingleTest(RandomizedRunner.java:947)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$5.evaluate(RandomizedRunner.java:832)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$6.evaluate(RandomizedRunner.java:883)
	at com.carrotsearch.randomizedtesting.RandomizedRunner$7.evaluate(RandomizedRunner.java:894)
	at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at org.apache.lucene.tests.util.TestRuleStoreClassName$1.evaluate(TestRuleStoreClassName.java:38)
	at com.carrotsearch.randomizedtesting.rules.NoShadowingOrOverridesOnMethodsRule$1.evaluate(NoShadowingOrOverridesOnMethodsRule.java:40)
	at com.carrotsearch.randomizedtesting.rules.NoShadowingOrOverridesOnMethodsRule$1.evaluate(NoShadowingOrOverridesOnMethodsRule.java:40)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at org.apache.lucene.tests.util.TestRuleAssertionsRequired$1.evaluate(TestRuleAssertionsRequired.java:53)
	at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
	at org.apache.lucene.tests.util.TestRuleMarkFailure$1.evaluate(TestRuleMarkFailure.java:44)
	at org.apache.lucene.tests.util.TestRuleIgnoreAfterMaxFailures$1.evaluate(TestRuleIgnoreAfterMaxFailures.java:60)
	at org.apache.lucene.tests.util.TestRuleIgnoreTestSuites$1.evaluate(TestRuleIgnoreTestSuites.java:47)
	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
	at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
	at com.carrotsearch.randomizedtesting.ThreadLeakControl$StatementRunner.run(ThreadLeakControl.java:368)
	at java.base/java.lang.Thread.run(Thread.java:1623)
	Suppressed: java.lang.AssertionError: expected:<0> but was:<1>
		at org.junit.Assert.fail(Assert.java:89)
		at org.junit.Assert.failNotEquals(Assert.java:835)
		at org.junit.Assert.assertEquals(Assert.java:647)
		at org.junit.Assert.assertEquals(Assert.java:633)
		at org.opensearch.index.shard.RemoteStoreRefreshListenerTests.lambda$testRefreshSuccessOnSecondAttempt$2(RemoteStoreRefreshListenerTests.java:269)
		at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1073)
		... 40 more

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented Jul 11, 2023

Flaky tests:

I reopened #8549 :(

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.snapshots.DedicatedClusterSnapshotRestoreIT.testIndexDeletionDuringSnapshotCreationInQueue
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication
      1 org.opensearch.cluster.ClusterHealthIT.testHealthOnClusterManagerFailover

@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #8585 (d997dfb) into main (3d7d33b) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #8585      +/-   ##
============================================
+ Coverage     70.76%   70.78%   +0.01%     
- Complexity    56921    57011      +90     
============================================
  Files          4759     4759              
  Lines        269676   269676              
  Branches      39451    39451              
============================================
+ Hits         190833   190884      +51     
- Misses        62717    62754      +37     
+ Partials      16126    16038      -88     
Impacted Files Coverage Δ
.../java/org/opensearch/identity/IdentityService.java 100.00% <ø> (ø)

... and 470 files with indirect coverage changes

@kotwanikunal kotwanikunal dismissed Rishikesh1159’s stale review July 11, 2023 20:35

Requested changes were implemented.

@kotwanikunal kotwanikunal merged commit 89533c8 into opensearch-project:main Jul 11, 2023
9 checks passed
vikasvb90 pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
raghuvanshraj pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
dzane17 pushed a commit to dzane17/OpenSearch that referenced this pull request Jul 12, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
buddharajusahil pushed a commit to buddharajusahil/OpenSearch that referenced this pull request Jul 18, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@saratvemulapalli saratvemulapalli added the backport 2.x Backport to 2.x branch label Aug 1, 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-8585-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 89533c80b7d79eec41f6f478196886ff3bf60193
# Push it to GitHub
git push --set-upstream origin backport/backport-8585-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-8585-to-2.x.

@saratvemulapalli
Copy link
Member

This change was not backported to 2.x and it uses a transitive dependency of com.google.guava:guava:30.1-android which has an active CVE: https://nvd.nist.gov/vuln/detail/CVE-2023-2976

saratvemulapalli pushed a commit to saratvemulapalli/OpenSearch that referenced this pull request Aug 2, 2023
…project#8585)

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
(cherry picked from commit 89533c8)
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
kotwanikunal pushed a commit that referenced this pull request Aug 2, 2023
* Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 (#8585)

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
(cherry picked from commit 89533c8)
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Fixing changelog

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Fixing Changelog again

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
kotwanikunal pushed a commit to kotwanikunal/OpenSearch that referenced this pull request Sep 13, 2023
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
(cherry picked from commit 89533c8)
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Add PR number

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in keystore too

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Bump in evil tests

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Specify extended path

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix third party audit

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: Shivansh Arora <hishiv@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.

None yet

7 participants