Backport HDFS-15963 to branch-3.2

[tasanuma]

Description of PR

Backport HDFS-15963 to branch-3.2. Cherry-picked it from branch-3.3 with fixing a minor conflict.

How was this patch tested?

For code changes:

• Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?
• Object storage: have the integration tests been executed and the endpoint declared according to the connector-specific documentation?
• If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
• If applicable, have you updated the LICENSE, LICENSE-binary, NOTICE-binary files?

[hadoop-yetus]

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	12m 26s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 0s		codespell was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 3 new or modified test files.
			_ branch-3.2 Compile Tests _
-1 ❌	mvninstall	26m 13s	/branch-mvninstall-root.txt	root in branch-3.2 failed.
+1 💚	compile	1m 2s		branch-3.2 passed
+1 💚	checkstyle	0m 49s		branch-3.2 passed
+1 💚	mvnsite	1m 10s		branch-3.2 passed
+1 💚	javadoc	0m 59s		branch-3.2 passed
+1 💚	spotbugs	2m 58s		branch-3.2 passed
+1 💚	shadedclient	15m 22s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 4s		the patch passed
+1 💚	compile	0m 56s		the patch passed
+1 💚	javac	0m 56s		hadoop-hdfs-project_hadoop-hdfs generated 0 new + 579 unchanged - 1 fixed = 579 total (was 580)
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 38s		the patch passed
+1 💚	mvnsite	1m 1s		the patch passed
+1 💚	javadoc	0m 50s		the patch passed
+1 💚	spotbugs	2m 50s		the patch passed
+1 💚	shadedclient	16m 3s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
-1 ❌	unit	219m 56s	/patch-unit-hadoop-hdfs-project_hadoop-hdfs.txt	hadoop-hdfs in the patch failed.
+1 💚	asflicense	0m 43s		The patch does not generate ASF License warnings.
		302m 54s

Reason	Tests
Failed junit tests	hadoop.hdfs.TestBlockStoragePolicy
	hadoop.hdfs.server.datanode.TestBPOfferService

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3668/1/artifact/out/Dockerfile
GITHUB PR	#3668
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux 13c5f6e618fc 4.15.0-112-generic #113-Ubuntu SMP Thu Jul 9 23:41:39 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	branch-3.2 / 10b159a
Default Java	Private Build-1.8.0_292-8u292-b10-0ubuntu1~18.04-b10
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3668/1/testReport/
Max. process+thread count	2979 (vs. ulimit of 5500)
modules	C: hadoop-hdfs-project/hadoop-hdfs U: hadoop-hdfs-project/hadoop-hdfs
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3668/1/console
versions	git=2.17.1 maven=3.6.0 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

[tasanuma]

The failed mvninstall and tests are not related, and they succeeded in my local computer. I just cherry-picked it from branch-3.3 with fixing a minor conflict, so I'd like to merge it.