HBASE-28947 Backport "HBASE-27598 Upgrade mockito to 4.x" to branch-2.5 #6415

NihalJain · 2024-10-30T11:24:54Z

Hadoop versions having HDFS-15915 need to either have mockito in their runtime or need to explicitly add it. For eg: see "HBASE-28944 TestShadedHBaseTestingUtility fails with NCDFE: org/mockito/stubbing/Answer"
Hence, instead of changing dependencies explicitly, we fall back to backporting HBASE-27598 which "Upgrade mockito to 4.x" for branch-2.5" which is present on all other branches, where this test seems to work as expected
Backports HBASE-27598 Upgrade mockito to 4.x #4998
Also as part of this fix we have made additional changes for the mockito migration as needed

NihalJain · 2024-10-30T11:28:21Z

Verified the test passes with this change:

[INFO] Running org.apache.hbase.shaded.TestShadedHBaseTestingUtility
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.801 s - in org.apache.hbase.shaded.TestShadedHBaseTestingUtility
[INFO] 
[INFO] Results:
[INFO] 
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
[INFO] 
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  24.297 s
[INFO] Finished at: 2024-10-30T16:57:15+05:30
[INFO] ------------------------------------------------------------------------

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java.rej

hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java.rej

stoty · 2024-10-30T11:29:44Z

Shouldn't we just call it HBASE-27598 ?
Isn't this 99% the same ?

stoty · 2024-10-30T11:30:11Z

We should also make sure that this works with 3.2.4. (The precommit CI should be enough)

NihalJain · 2024-10-30T11:35:11Z

Shouldn't we just call it HBASE-27598 ? Isn't this 99% the same ?

Sure I just wanted to keep the context in jira hence avoided updating title. But yeah let me close current jira as duplicate HBASE-28944 and create a backport jira for HBASE-27598 ?

- Hadoop versions having HDFS-15915 need to either have mockito in their runtime or need to explicitly add it, see "HBASE-28944 TestShadedHBaseTestingUtility fails with NCDFE: org/mockito/stubbing/Answer" - Hence, instead of changing dependencies explicitly, we fall back to backporting HBASE-27598 which "Upgrade mockito to 4.x" for branch-2.5" which is present on all other branches, where this test seems to work as expected - Also as part of this fix we have made additional changes for the mockito migration as needed

NihalJain · 2024-10-30T11:42:49Z

Shouldn't we just call it HBASE-27598 ? Isn't this 99% the same ?

Sure I just wanted to keep the context in jira hence avoided updating title. But yeah let me close current jira as duplicate HBASE-28944 and create a backport jira for HBASE-27598 ?

Updated!

stoty · 2024-10-30T15:29:25Z

LGTM but, ideally @Apache9 should also look at this, perhaps he had a specific reason not to backport to branch-2.5.

NihalJain · 2024-11-04T06:03:20Z

Hi @Apache9 could you please have a look at this?

Apache-HBase · 2024-11-05T01:04:14Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 41s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 0s		codespell was not available.
+0 🆗	detsecrets	0m 0s		detect-secrets was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	hbaseanti	0m 0s		Patch does not have any anti-patterns.
			_ branch-2.5 Compile Tests _
+0 🆗	mvndep	0m 18s		Maven dependency ordering for branch
+1 💚	mvninstall	2m 49s		branch-2.5 passed
+1 💚	compile	5m 10s		branch-2.5 passed
+1 💚	checkstyle	1m 10s		branch-2.5 passed
+1 💚	spotbugs	14m 11s		branch-2.5 passed
+1 💚	spotless	0m 57s		branch has no errors when running spotless:check.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 21s		Maven dependency ordering for patch
+1 💚	mvninstall	3m 37s		the patch passed
+1 💚	compile	7m 25s		the patch passed
+1 💚	javac	7m 25s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
-0 ⚠️	checkstyle	1m 34s	/results-checkstyle-root.txt	root: The patch generated 1 new + 42 unchanged - 0 fixed = 43 total (was 42)
+1 💚	xmllint	0m 0s		No new issues.
+1 💚	spotbugs	16m 51s		the patch passed
+1 💚	hadoopcheck	22m 44s		Patch does not cause any errors with Hadoop 2.10.2 or 3.2.4 3.3.6 3.4.0.
+1 💚	spotless	0m 58s		patch has no errors when running spotless:check.
			_ Other Tests _
+1 💚	asflicense	1m 20s		The patch does not generate ASF License warnings.
		83m 20s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6415/7/artifact/yetus-general-check/output/Dockerfile
GITHUB PR	#6415
Optional Tests	dupname asflicense javac spotbugs checkstyle codespell detsecrets compile hadoopcheck hbaseanti spotless xmllint
uname	Linux ecf8f5dc1f18 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.5 / `3dc8cd8`
Default Java	Eclipse Adoptium-11.0.23+9
Max. process+thread count	178 (vs. ulimit of 30000)
modules	C: hbase-client hbase-http hbase-server hbase-mapreduce hbase-rest hbase-hbtop . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6415/7/console
versions	git=2.34.1 maven=3.9.8 spotbugs=4.7.3 xmllint=20913
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

Apache-HBase · 2024-11-05T04:42:02Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 49s		Docker mode activated.
-0 ⚠️	yetus	0m 6s		Unprocessed flag(s): --brief-report-file --spotbugs-strict-precheck --author-ignore-list --blanks-eol-ignore-file --blanks-tabs-ignore-file --quick-hadoopcheck
			_ Prechecks _
			_ branch-2.5 Compile Tests _
+0 🆗	mvndep	0m 21s		Maven dependency ordering for branch
+1 💚	mvninstall	3m 17s		branch-2.5 passed
+1 💚	compile	2m 30s		branch-2.5 passed
+1 💚	javadoc	5m 24s		branch-2.5 passed
+1 💚	shadedjars	6m 7s		branch has no errors when building our shaded downstream artifacts.
			_ Patch Compile Tests _
+0 🆗	mvndep	0m 15s		Maven dependency ordering for patch
+1 💚	mvninstall	2m 58s		the patch passed
+1 💚	compile	2m 52s		the patch passed
+1 💚	javac	2m 52s		the patch passed
+1 💚	javadoc	4m 48s		the patch passed
+1 💚	shadedjars	5m 39s		patch has no errors when building our shaded downstream artifacts.
			_ Other Tests _
-1 ❌	unit	259m 48s	/patch-unit-root.txt	root in the patch failed.
		300m 50s

Subsystem	Report/Notes
Docker	ClientAPI=1.47 ServerAPI=1.47 base: https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6415/7/artifact/yetus-jdk17-hadoop3-check/output/Dockerfile
GITHUB PR	#6415
Optional Tests	javac javadoc unit compile shadedjars
uname	Linux 97cd8a50bd13 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/hbase-personality.sh
git revision	branch-2.5 / `3dc8cd8`
Default Java	Eclipse Adoptium-17.0.11+9
Test Results	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6415/7/testReport/
Max. process+thread count	4907 (vs. ulimit of 30000)
modules	C: hbase-client hbase-http hbase-server hbase-mapreduce hbase-rest hbase-hbtop . U: .
Console output	https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-6415/7/console
versions	git=2.34.1 maven=3.9.8
Powered by	Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

NihalJain · 2024-11-06T13:18:35Z

Hi @Apache9 did you get a chance to have a look at this PR?

ndimiduk

Skimmed. looks alight to me.

Apache9

LGTM.

In fact most changes are just boiler plate changes, just make the code can compile and can pass all the UTs are enough.

NihalJain · 2024-11-07T11:15:49Z

Failures were not related, merged! Thank you for your review @stoty @ndimiduk and @Apache9

….5 (apache#6415) - Hadoop versions having HDFS-15915 need to either have mockito in their runtime or need to explicitly add it, see "HBASE-28944 TestShadedHBaseTestingUtility fails with NCDFE: org/mockito/stubbing/Answer" - Hence, instead of changing dependencies explicitly, we fall back to backporting HBASE-27598 which "Upgrade mockito to 4.x" for branch-2.5" which is present on all other branches, where this test seems to work as expected - Also as part of this fix we have made additional changes for the mockito migration as needed Signed-off-by: Duo Zhang [email protected] Signed-off-by: Nick Dimiduk <[email protected]> Reviewed by: Istvan Toth <[email protected]>

NihalJain requested review from Apache9, apurtell, ndimiduk and stoty October 30, 2024 11:25

NihalJain commented Oct 30, 2024

View reviewed changes

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java.rej Outdated Show resolved Hide resolved

NihalJain commented Oct 30, 2024

View reviewed changes

hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java.rej Outdated Show resolved Hide resolved

NihalJain force-pushed the HBASE-28944 branch from 7830677 to f92bc4f Compare October 30, 2024 11:32

This comment has been minimized.

Sign in to view

NihalJain force-pushed the HBASE-28944 branch from f92bc4f to 3dc8cd8 Compare October 30, 2024 11:41

NihalJain changed the title ~~HBASE-28944 TestShadedHBaseTestingUtility fails with NCDFE: org/mocki…~~ HBASE-28947 Backport "HBASE-27598 Upgrade mockito to 4.x" to branch-2.5 Oct 30, 2024

This comment has been minimized.

Sign in to view

ndimiduk approved these changes Nov 7, 2024

View reviewed changes

Apache9 approved these changes Nov 7, 2024

View reviewed changes

NihalJain merged commit c4f0d52 into apache:branch-2.5 Nov 7, 2024
1 check failed

Uh oh!

HBASE-28947 Backport "HBASE-27598 Upgrade mockito to 4.x" to branch-2.5 #6415

HBASE-28947 Backport "HBASE-27598 Upgrade mockito to 4.x" to branch-2.5 #6415

Uh oh!

Conversation

NihalJain commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NihalJain commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stoty commented Oct 30, 2024

Uh oh!

stoty commented Oct 30, 2024

Uh oh!

NihalJain commented Oct 30, 2024

Uh oh!

This comment has been minimized.

NihalJain commented Oct 30, 2024

Uh oh!

This comment has been minimized.

stoty commented Oct 30, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

NihalJain commented Nov 4, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Apache-HBase commented Nov 5, 2024

Uh oh!

Apache-HBase commented Nov 5, 2024

Uh oh!

NihalJain commented Nov 6, 2024

Uh oh!

ndimiduk left a comment

Choose a reason for hiding this comment

Uh oh!

Apache9 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

NihalJain commented Nov 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

NihalJain commented Oct 30, 2024 •

edited

Loading

NihalJain commented Oct 30, 2024 •

edited

Loading