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

Change to compile protostuff using jdk 11 #374

Merged
merged 1 commit into from
Feb 10, 2022

Conversation

kaituo
Copy link
Collaborator

@kaituo kaituo commented Feb 10, 2022

Description

Previously, I built protostuff using JDK 14 and upgraded protostuff. 1.3.0 build started failing afterwards (logs here: opensearch-project/opensearch-build#1613), maybe because Jenkins uses JDK 11 (read #320). This PR rebuilt protostuff using JDK 11.

Testing done:

  1. Tested both single-stream and HCAD real-time detectors.

Issues Resolved

opensearch-project/opensearch-build#1613

Check List

  • 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.

Previously, I built protostuff using JDK 14 and upgraded protostuff. 1.3.0 build started failing afterwards (logs here: opensearch-project/opensearch-build#1613), maybe because Jenkins uses JDK 11 (read opensearch-project#320).  This PR rebuilt protostuff using JDK 11.

Testing done:
1. Tested both single-stream and HCAD real-time detectors.

Signed-off-by: Kaituo Li <[email protected]>
@kaituo kaituo requested review from a team, amitgalitz and ohltyler February 10, 2022 21:59
Copy link
Member

@amitgalitz amitgalitz left a comment

Choose a reason for hiding this comment

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

thanks for making the change!

@codecov-commenter
Copy link

Codecov Report

Merging #374 (a4b0f24) into main (e0bc4a2) will decrease coverage by 0.12%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #374      +/-   ##
============================================
- Coverage     79.11%   78.99%   -0.13%     
+ Complexity     4094     4079      -15     
============================================
  Files           295      295              
  Lines         17207    17207              
  Branches       1826     1826              
============================================
- Hits          13614    13593      -21     
- Misses         2695     2719      +24     
+ Partials        898      895       -3     
Flag Coverage Δ
plugin 78.99% <ø> (-0.13%) ⬇️

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

Impacted Files Coverage Δ
.../opensearch/ad/transport/StopDetectorResponse.java 19.04% <0.00%> (-23.81%) ⬇️
...c/main/java/org/opensearch/ad/util/ParseUtils.java 71.59% <0.00%> (-4.29%) ⬇️
...va/org/opensearch/ad/feature/SearchFeatureDao.java 82.78% <0.00%> (-3.86%) ⬇️
...g/opensearch/ad/model/DetectorValidationIssue.java 64.91% <0.00%> (-3.51%) ⬇️
...rch/ad/transport/ForwardADTaskTransportAction.java 94.06% <0.00%> (-3.39%) ⬇️
...ansport/handler/AnomalyResultBulkIndexHandler.java 67.74% <0.00%> (-3.23%) ⬇️
...in/java/org/opensearch/ad/model/AnomalyResult.java 81.60% <0.00%> (-1.34%) ⬇️
...ain/java/org/opensearch/ad/task/ADTaskManager.java 76.22% <0.00%> (-0.68%) ⬇️
...rch/ad/transport/AnomalyResultTransportAction.java 80.18% <0.00%> (ø)
.../main/java/org/opensearch/ad/ml/CheckpointDao.java 70.19% <0.00%> (+0.64%) ⬆️
... and 4 more

@opensearch-trigger-bot
Copy link

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

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

@ohltyler
Copy link
Member

ohltyler commented Mar 1, 2022

@VachaShah any idea why the backport is failing? ^

@VachaShah
Copy link
Contributor

@VachaShah any idea why the backport is failing? ^

Looks like there is some conflict:

CONFLICT (modify/delete): lib/protostuff-api-1.8.0-SNAPSHOT.jar deleted in HEAD and modified in a79028f (Change to compile protostuff using jdk 11 (#374)).  Version a79028f (Change to compile protostuff using jdk 11 (#374)) of lib/protostuff-api-1.8.0-SNAPSHOT.jar left in tree.
  CONFLICT (modify/delete): lib/protostuff-collectionschema-1.8.0-SNAPSHOT.jar deleted in HEAD and modified in a79028f (Change to compile protostuff using jdk 11 (#374)).  Version a79028f (Change to compile protostuff using jdk 11 (#374)) of lib/protostuff-collectionschema-1.8.0-SNAPSHOT.jar left in tree.
  CONFLICT (modify/delete): lib/protostuff-core-1.8.0-SNAPSHOT.jar deleted in HEAD and modified in a79028f (Change to compile protostuff using jdk 11 (#374)).  Version a79028f (Change to compile protostuff using jdk 11 (#374)) of lib/protostuff-core-1.8.0-SNAPSHOT.jar left in tree.
  CONFLICT (modify/delete): lib/protostuff-runtime-1.8.0-SNAPSHOT.jar deleted in HEAD and modified in a79028f (Change to compile protostuff using jdk 11 (#374)).  Version a79028f (Change to compile protostuff using jdk 11 (#374)) of lib/protostuff-runtime-1.8.0-SNAPSHOT.jar left in tree.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 2, 2022
Previously, I built protostuff using JDK 14 and upgraded protostuff. 1.3.0 build started failing afterwards (logs here: opensearch-project/opensearch-build#1613), maybe because Jenkins uses JDK 11 (read #320).  This PR rebuilt protostuff using JDK 11.

Testing done:
1. Tested both single-stream and HCAD real-time detectors.

Signed-off-by: Kaituo Li <[email protected]>
(cherry picked from commit a79028f)
ohltyler pushed a commit that referenced this pull request Mar 2, 2022
Previously, I built protostuff using JDK 14 and upgraded protostuff. 1.3.0 build started failing afterwards (logs here: opensearch-project/opensearch-build#1613), maybe because Jenkins uses JDK 11 (read #320).  This PR rebuilt protostuff using JDK 11.

Testing done:
1. Tested both single-stream and HCAD real-time detectors.

Signed-off-by: Kaituo Li <[email protected]>
(cherry picked from commit a79028f)
@ohltyler ohltyler mentioned this pull request Mar 9, 2022
1 task
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.

5 participants