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.

Sign up for GitHub

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

Jump to bottom

More removal of deprecated 'master' code #17218

Merged
merged 1 commit into from
Jan 31, 2025
Merged

More removal of deprecated 'master' code #17218

merged 1 commit into from
Jan 31, 2025

Conversation

andrross
Copy link
Member

Related Issues

Related to #5214

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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 GitHub Actions
Copy link
Contributor

❌ Gradle check result for ad7e7f8: FAILURE

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?

@andrross andrross force-pushed the more-master-cleanup branch from ad7e7f8 to 72c96c1 Compare January 31, 2025 17:28
reta
reta approved these changes Jan 31, 2025
View reviewed changes
Copy link
Collaborator

@reta reta left a comment

Choose a reason for hiding this comment

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

May need #17220 first

@github-actions GitHub Actions
Copy link
Contributor

❌ Gradle check result for 72c96c1: FAILURE

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?

@andrross andrross force-pushed the more-master-cleanup branch from 72c96c1 to d5f1e5c Compare January 31, 2025 18:24
@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for d5f1e5c: SUCCESS

@codecov Codecov
Copy link

codecov bot commented Jan 31, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 40.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 72.40%. Comparing base (1bf8b9c) to head (d5f1e5c).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
...on/admin/cluster/RestRestoreRemoteStoreAction.java 0.00% 2 Missing ⚠️
...stermanager/TransportClusterManagerNodeAction.java 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #17218      +/-   ##
============================================
+ Coverage     72.34%   72.40%   +0.06%     
- Complexity    65731    65763      +32     
============================================
  Files          5318     5318              
  Lines        305743   305674      -69     
  Branches      44350    44349       -1     
============================================
+ Hits         221182   221335     +153     
+ Misses        66394    66202     -192     
+ Partials      18167    18137      -30

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@andrross andrross merged commit 6fb0c1b into opensearch-project:main Jan 31, 2025
29 of 30 checks passed
@andrross andrross deleted the more-master-cleanup branch January 31, 2025 21:57
@reta
Copy link
Collaborator

reta commented Feb 3, 2025

@andrross seems like the regression slipped in somewhere:

java.lang.RuntimeException: Can't get cluster-manager node Cannot invoke "org.opensearch.cluster.node.DiscoveryNode.getName()" because the return value of "org.opensearch.cluster.node.DiscoveryNodes.getClusterManagerNode()" is null
	at __randomizedtesting.SeedInfo.seed([67EF2AF232207F64:608228B36F70C44C]:0)
	at org.opensearch.test.InternalTestCluster.getClusterManagerName(InternalTestCluster.java:2094)
	at org.opensearch.test.InternalTestCluster.getClusterManagerName(InternalTestCluster.java:2081)
	at org.opensearch.test.InternalTestCluster.nonClusterManagerClient(InternalTestCluster.java:888)
	at org.opensearch.cluster.SpecificClusterManagerNodesIT.lambda$testElectOnlyBetweenClusterManagerNodes$0(SpecificClusterManagerNodesIT.java:259)
	at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1124)
	at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1109)
	at org.opensearch.cluster.SpecificClusterManagerNodesIT.testElectOnlyBetweenClusterManagerNodes(SpecificClusterManagerNodesIT.java:257)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	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 org.opensearch.test.OpenSearchTestClusterRule$1.evaluate(OpenSearchTestClusterRule.java:369)
	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:1575)
Caused by: java.lang.NullPointerException: Cannot invoke "org.opensearch.cluster.node.DiscoveryNode.getName()" because the return value of "org.opensearch.cluster.node.DiscoveryNodes.getClusterManagerNode()" is null
	at org.opensearch.test.InternalTestCluster.getClusterManagerName(InternalTestCluster.java:2091)
	... 45 more

[1] https://build.ci.opensearch.org/job/gradle-check/53018/
[2] https://build.ci.opensearch.org/job/gradle-check/53022/

@andrross
Copy link
Member Author

andrross commented Feb 3, 2025

@reta Ugh, I'll take a look this morning. Feel free to revert if it's blocking.

@reta
Copy link
Collaborator

reta commented Feb 3, 2025

@reta Ugh, I'll take a look this morning. Feel free to revert if it's blocking.

Thanks @andrross , I believe no urgence here (this is 3.0 only), please take your time, thanks again !

@andrross
Copy link
Member Author

andrross commented Feb 3, 2025

@reta Actually it looks like this failure has been happening for months now (#15944) and a fix is in progress. I believe it is actually unrelated to this change. I'll see about getting that fix merged ASAP.

@reta
Copy link
Collaborator

reta commented Feb 3, 2025

@reta Actually it looks like this failure has been happening for months now (#15944) and a fix is in progress. I believe it is actually unrelated to this change. I'll see about getting that fix merged ASAP.

Oh thanks @andrross , sorry for false alarm

@aggarwalShivani aggarwalShivani mentioned this pull request Feb 12, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reta reta reta approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jed326 jed326 Awaiting requested review from jed326 jed326 is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

Assignees
No one assigned
Labels
skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andrross @reta