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

[Backport 2.x] [Bug] Fix Build Metadata #7818

Merged
merged 1 commit into from
Jul 8, 2023
Merged

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

@opensearch-trigger-bot opensearch-trigger-bot bot commented May 30, 2023

Backport 287ac90 from #7817.

depends on #8382

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented May 30, 2023

Looks like a legit failure:

java.lang.AssertionError: Values should be different. Actual: unknown
	at __randomizedtesting.SeedInfo.seed([F2711EFE75B60760:DEB1795DDAEF982B]:0)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.failEquals(Assert.java:187)
	at org.junit.Assert.assertNotEquals(Assert.java:163)
	at org.junit.Assert.assertNotEquals(Assert.java:177)
	at org.opensearch.BuildTests.testJarMetadata(BuildTests.java:65)

@dblock
Copy link
Member

dblock commented May 30, 2023

@Xtansia

@Xtansia
Copy link
Contributor

Xtansia commented May 31, 2023

@reta @dblock Test is failing because the refactoring in #7328 hasn't been backported to 2.x/2.8, so code source is evaluating to classes dir of server, whereas with refactoring it evaluates to the jar of opensearch-core.

If the refactor is not being backported then these backported fixes can probably be dropped.

Is the refactor supposed to be backported @nknize?

@nknize
Copy link
Collaborator

nknize commented May 31, 2023

Yes, I actually forgot I hadn't backported that refactor yet. Let's hold off. We can either close these backport PRs or mark them as WIP until I backport all the remaining refactor PRs. I don't plan to do that until #8157 lands. Which is one of the big decoupling milestones we're working towards.

@opensearch-trigger-bot
Copy link
Contributor Author

This PR is stalled because it has been open for 30 days with no activity. Remove stalled label or comment or this will be closed in 7 days.

@nknize
Copy link
Collaborator

nknize commented Jun 30, 2023

I opened the #7328 backport PR. I'll approve and merge this after that PR is merged.

@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Jul 1, 2023
@dblock
Copy link
Member

dblock commented Jul 6, 2023

@nknize that was merged

Refactoring Build to core library broke the build metadata. Test
coverage was insufficient to catch this bug. This commit fixes the
build metadata and improves test coverage such that any unexpected
metadata changes are caught.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
Co-authored-by: Nicholas Walter Knize <nknize@apache.org>
Co-authored-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 287ac90)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@nknize nknize force-pushed the backport/backport-7817-to-2.x branch from bf7a0dd to 3e769ea Compare July 7, 2023 22:53
@nknize nknize requested a review from sachinpkale as a code owner July 7, 2023 22:53
@nknize nknize added v2.9.0 'Issues and PRs related to version v2.9.0' bug Something isn't working labels Jul 7, 2023
Copy link
Collaborator

@nknize nknize left a comment

Choose a reason for hiding this comment

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

Requisite backport PRs have landed. Will merge once checks pass here.

@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      3 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString

@codecov
Copy link

codecov bot commented Jul 8, 2023

Codecov Report

Merging #7818 (3e769ea) into 2.x (e3762b4) will increase coverage by 0.07%.
The diff coverage is 87.50%.

@@             Coverage Diff              @@
##                2.x    #7818      +/-   ##
============================================
+ Coverage     70.61%   70.68%   +0.07%     
+ Complexity    57114    57113       -1     
============================================
  Files          4748     4747       -1     
  Lines        270610   270565      -45     
  Branches      39941    39936       -5     
============================================
+ Hits         191079   191254     +175     
+ Misses        63132    62892     -240     
- Partials      16399    16419      +20     
Impacted Files Coverage Δ
.../org/opensearch/common/util/LongHashBenchmark.java 0.00% <ø> (ø)
...n/src/main/java/org/opensearch/common/Classes.java 33.33% <ø> (ø)
.../src/main/java/org/opensearch/common/Explicit.java 63.63% <ø> (ø)
...rch/common/ExponentiallyWeightedMovingAverage.java 100.00% <ø> (ø)
...in/java/org/opensearch/common/LocalTimeOffset.java 87.75% <ø> (ø)
...java/org/opensearch/common/MacAddressProvider.java 40.62% <ø> (ø)
...main/java/org/opensearch/common/NamedRegistry.java 100.00% <ø> (ø)
...n/src/main/java/org/opensearch/common/Numbers.java 88.54% <ø> (+8.16%) ⬆️
...rg/opensearch/common/RandomBasedUUIDGenerator.java 100.00% <ø> (ø)
...java/org/opensearch/common/SecureRandomHolder.java 50.00% <ø> (ø)
... and 145 more

... and 413 files with indirect coverage changes

@nknize nknize merged commit e0cf064 into 2.x Jul 8, 2023
@github-actions github-actions bot deleted the backport/backport-7817-to-2.x branch July 8, 2023 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working skip-changelog v2.9.0 'Issues and PRs related to version v2.9.0'
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants