Skip to content

HADOOP-17812. NPE in S3AInputStream read() after failure to reconnect to store #3222

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

Merged
steveloughran merged 3 commits into from
Jul 30, 2021
Merged

HADOOP-17812. NPE in S3AInputStream read() after failure to reconnect to store #3222

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9f4bde
Fix s3a NPE when reading
wbo4958 Jul 22, 2021
68755aa
add test
wbo4958 Jul 24, 2021
d7659fb
resolve comments
wbo4958 Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,12 @@ public synchronized int read() throws IOException {
() -> {
int b;
try {
// When exception happens before re-setting wrappedStream in "reopen" called
// by onReadFailure, then wrappedStream will be null. But the **retry** may
// re-execute this block and cause NPE if we don't check wrappedStream
if (wrappedStream == null) {
throw new IOException("Null IO stream for reading " + uri);
}
b = wrappedStream.read();
} catch (EOFException e) {
return -1;
Expand Down Expand Up @@ -507,6 +513,12 @@ public synchronized int read(byte[] buf, int off, int len)
() -> {
int bytes;
try {
// When exception happens before re-setting wrappedStream in "reopen" called
// by onReadFailure, then wrappedStream will be null. But the **retry** may
// re-execute this block and cause NPE if we don't check wrappedStream
if (wrappedStream == null) {
throw new IOException("Null IO stream for reading " + uri);
}
bytes = wrappedStream.read(buf, off, len);
} catch (EOFException e) {
// the base implementation swallows EOFs.
Expand Down