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

Bump JNA from 5.5 to 5.13 #9963

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Bump JNA from 5.5 to 5.13 #9963

merged 1 commit into from
Sep 11, 2023

Conversation

austintlee
Copy link
Contributor

Description

JNA version of 5.5 is still used causing some issues running integTest on Mac M1/2. JNA 5.7 introduced support for Mac aarch64. I see that we are already using JNA 5.13 in 'server'.

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 11, 2023

Compatibility status:

Checks if related components are compatible with change 37a5dd0

Incompatible components

Incompatible components: [https://github.com/opensearch-project/security.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.repositories.azure.AzureBlobContainerRetriesTests.testReadRangeBlobWithRetries

@codecov
Copy link

codecov bot commented Sep 11, 2023

Codecov Report

Merging #9963 (abca57d) into main (c100c0c) will decrease coverage by 0.02%.
Report is 3 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head abca57d differs from pull request most recent head 37a5dd0. Consider uploading reports for the commit 37a5dd0 to get more accurate results

@@             Coverage Diff              @@
##               main    #9963      +/-   ##
============================================
- Coverage     71.16%   71.15%   -0.02%     
+ Complexity    58114    58109       -5     
============================================
  Files          4824     4824              
  Lines        273897   273897              
  Branches      39910    39910              
============================================
- Hits         194926   194887      -39     
- Misses        62573    62664      +91     
+ Partials      16398    16346      -52     
Files Changed Coverage Δ
...main/java/org/opensearch/common/collect/Tuple.java 64.70% <ø> (ø)
...java/org/opensearch/common/crypto/DataKeyPair.java 0.00% <ø> (ø)
...h/common/crypto/DecryptedRangedStreamProvider.java 0.00% <ø> (ø)
...g/opensearch/compress/spi/CompressionProvider.java 100.00% <ø> (ø)
...cli/src/main/java/org/opensearch/cli/Terminal.java 74.73% <100.00%> (ø)

... and 487 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.basic.SearchWithRandomIOExceptionsIT.testRandomDirectoryIOExceptions
      1 org.opensearch.search.basic.SearchWithRandomIOExceptionsIT.classMethod

@reta
Copy link
Collaborator

reta commented Sep 11, 2023

@austintlee could you please fix DCO check? thank you

@austintlee
Copy link
Contributor Author

@reta it's a Github settings issue. I think it's because my primary email does not match what's in my signature.

Commit sha: [1b6d88d](https://github.com/opensearch-project/OpenSearch/pull/9963/commits/1b6d88df30968a65be09eafe16c62670bf02ec3d), Author: Austin Lee, Committer: GitHub; Can not find "Austin Lee [[email protected]](mailto:[email protected])", in ["Austin Lee [[email protected]](mailto:[email protected])", "Austin Lee [[email protected]](mailto:[email protected])", "Austin Lee [[email protected]](mailto:[email protected])", "Austin Lee [[email protected]](mailto:[email protected])"].

I switched my primary email, but I think we can override this check since I do have a proper DCO in every commit? Or can you force it to re-run the check? I don't know for certain exactly how Github is picking up that old email (I did use it for my first few contributions).

@reta
Copy link
Collaborator

reta commented Sep 11, 2023

I switched my primary email, but I think we can override this check since I do have a proper DCO in every commit? Or can you force it to re-run the check?

We could override DCO check when the only option, but you could amend the last commit and do force push to fix the issue.

@austintlee
Copy link
Contributor Author

The problem is that that would require me to use an email that I don't want to put in the DCO. Since I corrected my email in my Github settings, do you think we can rerun the DCO check?

Signed-off-by: Austin Lee <[email protected]>

Update changelog.

Signed-off-by: Austin Lee <[email protected]>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit 04f90dc into opensearch-project:main Sep 11, 2023
10 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Sep 11, 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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-9963-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 04f90dc3a1e859cc2caf87a223006c188a1252f4
# Push it to GitHub
git push --set-upstream origin backport/backport-9963-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

@reta
Copy link
Collaborator

reta commented Sep 11, 2023

@austintlee sadly needs manual backport to 2.x

@austintlee
Copy link
Contributor Author

I'm on it!

austintlee added a commit to austintlee/OpenSearch that referenced this pull request Sep 11, 2023
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit 04f90dc)
austintlee added a commit to austintlee/OpenSearch that referenced this pull request Sep 11, 2023
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit 04f90dc)
reta pushed a commit that referenced this pull request Sep 11, 2023
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit 04f90dc)
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
sarthakaggarwal97 pushed a commit to sarthakaggarwal97/OpenSearch that referenced this pull request Sep 20, 2023
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
Signed-off-by: Ivan Brusic <[email protected]>
vikasvb90 pushed a commit to vikasvb90/OpenSearch that referenced this pull request Oct 10, 2023
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Update changelog.

Signed-off-by: Austin Lee <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants