HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. #3880

Jackson-Wang-7 · 2022-01-13T03:26:03Z

Description of PR

if there are two or more blocks exist in a same rack, it may cause unique data block is added to exactlyOne processing list when choosing redundancy stripted block to delete.
`

storages.remove(cur);
if (storages.isEmpty()) {
  rackMap.remove(rack);
}
if (moreThanOne.remove(cur)) {
  if (storages.size() == 1) {
    **

    final DatanodeStorageInfo remaining = storages.get(0);
    moreThanOne.remove(remaining);
    exactlyOne.add(remaining);

    **
  }
} else {
  exactlyOne.remove(cur);
}

`

In this case, moreThanOne list may not contain the remaining block. The remaining block shouldn’t be deleted, but it is added to exactlyOne list. And then it will be deleted.

How was this patch tested?

The testcase is that:(EC 6+3)
blk_-xxx009 in rack /d1/r1
blk_-xxx008 in rack /d1/r1
blk_-xxx008 in rack /d1/r2
blk_-xxx008 in rack /d1/r3
blk_-xxx007 in rack /d1/r4
blk_-xxx006 in rack /d2/r1
blk_-xxx005 in rack /d2/r2
blk_-xxx004 in rack /d2/r3
blk_-xxx003 in rack /d2/r4
blk_-xxx002 in rack /d2/r5
blk_-xxx001 in rack /d2/r6
After the FBR is triggered and redundant data blocks are added to invalidate list, blk_-xxx008 in rack /d1/r1 and blk_-xxx008 in rack /d1/r2 need to be deleted, blk_-xxx009 is HEALTHY.

Jackson-Wang-7 · 2022-01-13T03:33:09Z

@Hexiaoqiao @ayushtkn Please take a look at this PR. We have started testing in this way.

hadoop-yetus · 2022-01-13T09:01:32Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 45s		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 2 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	33m 9s		trunk passed
+1 💚	compile	1m 27s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	compile	1m 22s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	checkstyle	0m 59s		trunk passed
+1 💚	mvnsite	1m 28s		trunk passed
+1 💚	javadoc	1m 1s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 37s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	3m 19s		trunk passed
+1 💚	shadedclient	22m 27s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 18s		the patch passed
+1 💚	compile	1m 17s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javac	1m 17s		the patch passed
+1 💚	compile	1m 12s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	javac	1m 12s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
-0 ⚠️	checkstyle	0m 53s	/results-checkstyle-hadoop-hdfs-project_hadoop-hdfs.txt	hadoop-hdfs-project/hadoop-hdfs: The patch generated 2 new + 131 unchanged - 0 fixed = 133 total (was 131)
+1 💚	mvnsite	1m 15s		the patch passed
+1 💚	javadoc	0m 52s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 30s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	3m 25s		the patch passed
+1 💚	shadedclient	23m 3s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	233m 27s		hadoop-hdfs in the patch passed.
+1 💚	asflicense	0m 47s		The patch does not generate ASF License warnings.
		334m 10s

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/1/artifact/out/Dockerfile
GITHUB PR	#3880
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux 7f4a32876506 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	trunk / d26ee090c4316e9ac73120dd0e39b30f6593b186
Default Java	Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/1/testReport/
Max. process+thread count	3582 (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-3880/1/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

tasanuma · 2022-01-13T11:27:56Z

@Jackson-Wang-7 Thanks for submitting the PR. It makes sense to me. Could you fix the check style issues?

...-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java

…y striped blocks.

tasanuma

+1, pending Jenkins.

hadoop-yetus · 2022-01-14T08:09:22Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 44s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		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 2 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	33m 10s		trunk passed
+1 💚	compile	1m 28s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	compile	1m 23s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	checkstyle	1m 1s		trunk passed
+1 💚	mvnsite	1m 27s		trunk passed
+1 💚	javadoc	1m 1s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 35s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	3m 18s		trunk passed
+1 💚	shadedclient	22m 30s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 19s		the patch passed
+1 💚	compile	1m 21s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javac	1m 21s		the patch passed
+1 💚	compile	1m 11s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	javac	1m 11s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 52s		the patch passed
+1 💚	mvnsite	1m 17s		the patch passed
+1 💚	javadoc	0m 52s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 24s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	3m 31s		the patch passed
+1 💚	shadedclient	22m 35s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
-1 ❌	unit	227m 55s	/patch-unit-hadoop-hdfs-project_hadoop-hdfs.txt	hadoop-hdfs in the patch passed.
+1 💚	asflicense	0m 45s		The patch does not generate ASF License warnings.
		328m 1s

Reason	Tests
Failed junit tests	hadoop.hdfs.TestRollingUpgrade

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/2/artifact/out/Dockerfile
GITHUB PR	#3880
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux eb976fdc1cb0 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	trunk / 22121dfd0f72d84894610037bef0c039f006c2fb
Default Java	Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/2/testReport/
Max. process+thread count	3463 (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-3880/2/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

hadoop-yetus · 2022-01-14T11:09:21Z

💔 -1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 0s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		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 2 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	40m 6s		trunk passed
+1 💚	compile	1m 52s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	compile	1m 38s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	checkstyle	1m 6s		trunk passed
+1 💚	mvnsite	1m 45s		trunk passed
+1 💚	javadoc	1m 31s		trunk passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 44s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	4m 14s		trunk passed
+1 💚	shadedclient	30m 19s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 33s		the patch passed
+1 💚	compile	1m 42s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javac	1m 42s		the patch passed
+1 💚	compile	1m 28s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	javac	1m 28s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	0m 56s		the patch passed
+1 💚	mvnsite	1m 33s		the patch passed
+1 💚	javadoc	1m 0s		the patch passed with JDK Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04
+1 💚	javadoc	1m 27s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	4m 0s		the patch passed
+1 💚	shadedclient	29m 4s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
-1 ❌	unit	363m 29s	/patch-unit-hadoop-hdfs-project_hadoop-hdfs.txt	hadoop-hdfs in the patch passed.
+1 💚	asflicense	0m 51s		The patch does not generate ASF License warnings.
		488m 27s

Reason	Tests
Failed junit tests	hadoop.hdfs.server.sps.TestExternalStoragePolicySatisfier

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/3/artifact/out/Dockerfile
GITHUB PR	#3880
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux fd74107f605c 4.15.0-153-generic #160-Ubuntu SMP Thu Jul 29 06:54:29 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `87ea3b1`
Default Java	Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.13+8-Ubuntu-0ubuntu1.20.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-3880/3/testReport/
Max. process+thread count	2204 (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-3880/3/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

tomscut

LGTM.

tasanuma

LGTM.

tasanuma · 2022-01-14T13:39:03Z

Thanks for fixing this issue, @Jackson-Wang-7. Thanks for reviewing it, @tomscut.

…y striped blocks. (#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org> (cherry picked from commit d886282)

…y striped blocks. (#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org> (cherry picked from commit d886282) (cherry picked from commit 74d3e83)

…y striped blocks. (#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org>

…y striped blocks. (apache#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org>

…ng redundancy striped blocks. (apache#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org> (cherry picked from commit d886282) (cherry picked from commit 74d3e83) Change-Id: I7d0b88180cb8643e6dca7f7922b350b3c82ac2f6 (cherry picked from commit 171d1bfc7ecd981ebea087a70827a9eb1680a6b6) (cherry picked from commit 0e45563bccc59ef3d456210ebd3c35f0461ed90e)

echomyecho · 2024-01-02T11:08:15Z

hello, @Jackson-Wang-7 Does this fix adapt to Hadoop 3.1 version?

Jackson-Wang-7 changed the title ~~HDFS-16420. Avoid deleting unique data blocks when deleting redundanc…~~ HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. Jan 13, 2022

tomscut reviewed Jan 13, 2022

View reviewed changes

Jackson-Wang-7 force-pushed the HDFS-16420 branch from d26ee09 to 22121df Compare January 14, 2022 02:40

HDFS-16420. Avoid deleting unique data blocks when deleting redundanc…

87ea3b1

…y striped blocks.

Jackson-Wang-7 force-pushed the HDFS-16420 branch from 22121df to 87ea3b1 Compare January 14, 2022 02:59

tasanuma reviewed Jan 14, 2022

View reviewed changes

tomscut approved these changes Jan 14, 2022

View reviewed changes

tasanuma approved these changes Jan 14, 2022

View reviewed changes

tasanuma merged commit d886282 into apache:trunk Jan 14, 2022

sunchao pushed a commit that referenced this pull request Jan 14, 2022

HDFS-16420. Avoid deleting unique data blocks when deleting redundanc…

d7cacea

…y striped blocks. (#3880) Reviewed-by: litao <tomleescut@gmail.com> Signed-off-by: Takanobu Asanuma <tasanuma@apache.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. #3880

HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. #3880

Jackson-Wang-7 commented Jan 13, 2022 •

edited

Jackson-Wang-7 commented Jan 13, 2022

hadoop-yetus commented Jan 13, 2022

tasanuma commented Jan 13, 2022

tasanuma left a comment

hadoop-yetus commented Jan 14, 2022

hadoop-yetus commented Jan 14, 2022

tomscut left a comment

tasanuma left a comment

tasanuma commented Jan 14, 2022

echomyecho commented Jan 2, 2024

HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. #3880

HDFS-16420. Avoid deleting unique data blocks when deleting redundancy striped blocks. #3880

Conversation

Jackson-Wang-7 commented Jan 13, 2022 • edited

Description of PR

How was this patch tested?

Jackson-Wang-7 commented Jan 13, 2022

hadoop-yetus commented Jan 13, 2022

tasanuma commented Jan 13, 2022

tasanuma left a comment

Choose a reason for hiding this comment

hadoop-yetus commented Jan 14, 2022

hadoop-yetus commented Jan 14, 2022

tomscut left a comment

Choose a reason for hiding this comment

tasanuma left a comment

Choose a reason for hiding this comment

tasanuma commented Jan 14, 2022

echomyecho commented Jan 2, 2024

Jackson-Wang-7 commented Jan 13, 2022 •

edited