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 HADOOP-18546: ABFS: Disable purging list of in progress reads in abfs stream closed in 3.3.4 #5531

Closed
wants to merge 6 commits into from

Conversation

anujmodi2021
Copy link
Contributor

Description of PR

Jira Ticket: https://issues.apache.org/jira/browse/HADOOP-18546

This task is to cherry pick the fixes to all the branches where the data corruption fix has gone in.

More details on the task and issue: HADOOP-18521 ABFS ReadBufferManager buffer sharing across concurrent HTTP requests - ASF JIRA (apache.org)

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?

steveloughran and others added 4 commits April 4, 2023 01:07

This is a followup to the original HADOOP-18546
patch; cherry-picks of that should include this
or follow up with it.

Removes risk of race conditions in assertions
of ITestReadBufferManager on the state of the in-progress
and completed queues by removing assertions brittle
to race conditions in scheduling/network IO

* Waits for all the executor pool shutdown to complete before
  making any assertions
* Assertions that there are no in progress reads MUST be
  cut as there may be some and they won't be cancelled.
* Assertions that the completed list is without buffers
  of a closed stream are brittle because if there was
  an in progress stream which completed after stream.close()
  then it will end up in the list.

Contributed by Steve Loughran
Followup patch to  HADOOP-18456 as part of HADOOP-18521,
ABFS ReadBufferManager buffer sharing across concurrent HTTP requests

Add probes of readahead fix aid in checking safety of
hadoop ABFS client across different releases.

* ReadBufferManager constructor logs the fact it is safe at TRACE
* AbfsInputStream declares it is fixed in toString()
  by including fs.azure.capability.readahead.safe" in the
  result.

The ABFS FileSystem hasPathCapability("fs.azure.capability.readahead.safe")
probe returns true to indicate the client's readahead manager has been fixed
to be safe when prefetching.

All Hadoop releases for which probe this returns false
and for which the probe "fs.capability.etags.available"
returns true at risk of returning invalid data when reading
ADLS Gen2/Azure storage data.

Contributed by Steve Loughran.
@anujmodi2021 anujmodi2021 changed the title Branch 3.3.4 Backport HADOOP-18546: ABFS: Disable purging list of in progress reads in abfs stream closed in 3.3.4 Apr 4, 2023
Anuj Modi and others added 2 commits April 4, 2023 04:17
Fixes a javadoc error which came with
HADOOP-18577. ABFS: Add probes of readahead fix (apache#5205)

Part of the HADOOP-18521 ABFS readahead fix; MUST be included.

Contributed by Steve Loughran
@hadoop-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 10m 40s 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 5 new or modified test files.
_ branch-3.3.4 Compile Tests _
+0 🆗 mvndep 14m 37s Maven dependency ordering for branch
+1 💚 mvninstall 23m 23s branch-3.3.4 passed
+1 💚 compile 17m 39s branch-3.3.4 passed
+1 💚 checkstyle 2m 49s branch-3.3.4 passed
+1 💚 mvnsite 2m 28s branch-3.3.4 passed
+1 💚 javadoc 2m 33s branch-3.3.4 passed
+1 💚 spotbugs 3m 52s branch-3.3.4 passed
+1 💚 shadedclient 24m 31s branch has no errors when building and testing our client artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 29s Maven dependency ordering for patch
-1 ❌ mvninstall 0m 28s /patch-mvninstall-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
-1 ❌ compile 16m 21s /patch-compile-root.txt root in the patch failed.
-1 ❌ javac 16m 21s /patch-compile-root.txt root in the patch failed.
+1 💚 blanks 0m 0s The patch has no blanks issues.
-0 ⚠️ checkstyle 2m 42s /results-checkstyle-root.txt root: The patch generated 2 new + 4 unchanged - 0 fixed = 6 total (was 4)
-1 ❌ mvnsite 0m 51s /patch-mvnsite-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
+1 💚 xml 0m 1s The patch has no ill-formed XML file.
-1 ❌ javadoc 0m 43s /patch-javadoc-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
-1 ❌ spotbugs 0m 49s /patch-spotbugs-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
+1 💚 shadedclient 25m 19s patch has no errors when building and testing our client artifacts.
_ Other Tests _
+1 💚 unit 17m 16s hadoop-common in the patch passed.
-1 ❌ unit 0m 39s /patch-unit-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
+1 💚 asflicense 0m 55s The patch does not generate ASF License warnings.
177m 55s
Subsystem Report/Notes
Docker ClientAPI=1.42 ServerAPI=1.42 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/1/artifact/out/Dockerfile
GITHUB PR #5531
Optional Tests dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient codespell xml spotbugs checkstyle
uname Linux 502eb0648744 4.15.0-206-generic #217-Ubuntu SMP Fri Feb 3 19:10:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/bin/hadoop.sh
git revision branch-3.3.4 / 227db1d
Default Java Private Build-1.8.0_362-8u362-ga-0ubuntu1~18.04.1-b09
Test Results https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/1/testReport/
Max. process+thread count 3158 (vs. ulimit of 5500)
modules C: hadoop-common-project/hadoop-common hadoop-tools/hadoop-azure U: .
Console output https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/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.

@hadoop-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 56s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 1s 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 5 new or modified test files.
_ branch-3.3.4 Compile Tests _
+0 🆗 mvndep 14m 24s Maven dependency ordering for branch
+1 💚 mvninstall 25m 25s branch-3.3.4 passed
+1 💚 compile 17m 30s branch-3.3.4 passed
+1 💚 checkstyle 2m 45s branch-3.3.4 passed
+1 💚 mvnsite 2m 28s branch-3.3.4 passed
+1 💚 javadoc 2m 30s branch-3.3.4 passed
+1 💚 spotbugs 3m 54s branch-3.3.4 passed
+1 💚 shadedclient 24m 23s branch has no errors when building and testing our client artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 27s Maven dependency ordering for patch
+1 💚 mvninstall 1m 28s the patch passed
+1 💚 compile 16m 55s the patch passed
-1 ❌ javac 16m 55s /results-compile-javac-root.txt root generated 2 new + 1970 unchanged - 2 fixed = 1972 total (was 1972)
+1 💚 blanks 0m 0s The patch has no blanks issues.
-0 ⚠️ checkstyle 2m 33s /results-checkstyle-root.txt root: The patch generated 2 new + 4 unchanged - 0 fixed = 6 total (was 4)
+1 💚 mvnsite 2m 27s the patch passed
+1 💚 xml 0m 1s The patch has no ill-formed XML file.
-1 ❌ javadoc 0m 44s /patch-javadoc-hadoop-tools_hadoop-azure.txt hadoop-azure in the patch failed.
+1 💚 spotbugs 4m 0s the patch passed
+1 💚 shadedclient 26m 12s patch has no errors when building and testing our client artifacts.
_ Other Tests _
+1 💚 unit 18m 20s hadoop-common in the patch passed.
+1 💚 unit 2m 17s hadoop-azure in the patch passed.
+1 💚 asflicense 0m 55s The patch does not generate ASF License warnings.
175m 27s
Subsystem Report/Notes
Docker ClientAPI=1.42 ServerAPI=1.42 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/2/artifact/out/Dockerfile
GITHUB PR #5531
Optional Tests dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient codespell xml spotbugs checkstyle
uname Linux 8fcb8240187a 4.15.0-206-generic #217-Ubuntu SMP Fri Feb 3 19:10:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/bin/hadoop.sh
git revision branch-3.3.4 / c7e19bc
Default Java Private Build-1.8.0_362-8u362-ga-0ubuntu1~18.04.1-b09
Test Results https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/2/testReport/
Max. process+thread count 1265 (vs. ulimit of 5500)
modules C: hadoop-common-project/hadoop-common hadoop-tools/hadoop-azure U: .
Console output https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/2/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.

@hadoop-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 10m 14s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 1s 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 5 new or modified test files.
_ branch-3.3.4 Compile Tests _
+0 🆗 mvndep 14m 27s Maven dependency ordering for branch
+1 💚 mvninstall 26m 49s branch-3.3.4 passed
+1 💚 compile 18m 24s branch-3.3.4 passed
+1 💚 checkstyle 2m 57s branch-3.3.4 passed
+1 💚 mvnsite 2m 13s branch-3.3.4 passed
+1 💚 javadoc 2m 14s branch-3.3.4 passed
+1 💚 spotbugs 3m 42s branch-3.3.4 passed
+1 💚 shadedclient 25m 40s branch has no errors when building and testing our client artifacts.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 23s Maven dependency ordering for patch
+1 💚 mvninstall 1m 25s the patch passed
+1 💚 compile 17m 38s the patch passed
-1 ❌ javac 17m 38s /results-compile-javac-root.txt root generated 1 new + 1977 unchanged - 1 fixed = 1978 total (was 1978)
+1 💚 blanks 0m 0s The patch has no blanks issues.
-0 ⚠️ checkstyle 2m 44s /results-checkstyle-root.txt root: The patch generated 2 new + 4 unchanged - 0 fixed = 6 total (was 4)
+1 💚 mvnsite 2m 12s the patch passed
+1 💚 xml 0m 2s The patch has no ill-formed XML file.
+1 💚 javadoc 2m 7s the patch passed
+1 💚 spotbugs 3m 46s the patch passed
+1 💚 shadedclient 26m 4s patch has no errors when building and testing our client artifacts.
_ Other Tests _
+1 💚 unit 16m 59s hadoop-common in the patch passed.
+1 💚 unit 2m 2s hadoop-azure in the patch passed.
+1 💚 asflicense 0m 51s The patch does not generate ASF License warnings.
185m 34s
Subsystem Report/Notes
Docker ClientAPI=1.42 ServerAPI=1.42 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/3/artifact/out/Dockerfile
GITHUB PR #5531
Optional Tests dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient codespell xml spotbugs checkstyle
uname Linux 73842b351f51 4.15.0-206-generic #217-Ubuntu SMP Fri Feb 3 19:10:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/bin/hadoop.sh
git revision branch-3.3.4 / a139ae7
Default Java Private Build-1.8.0_362-8u362-ga-0ubuntu1~18.04.1-b09
Test Results https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/3/testReport/
Max. process+thread count 2220 (vs. ulimit of 5500)
modules C: hadoop-common-project/hadoop-common hadoop-tools/hadoop-azure U: .
Console output https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-5531/3/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.

Copy link
Member

@ayushtkn ayushtkn left a comment

Choose a reason for hiding this comment

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

your target branch is wrong, 3.3.4 is already released, if you want this in next 3.3.x release, raise a PR to branch-3 and it would be in 3.3.6, before that all are released in the 3.3.x, you can't get anything new included in those released versions

@ayushtkn ayushtkn closed this Apr 19, 2023
@anujmodi2021 anujmodi2021 deleted the branch-3.3.4 branch April 22, 2024 04:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants