Skip to content

Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() #1476

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
bsideup merged 7 commits into from
Nov 16, 2020
+27 −35
Merged

Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b99a84
Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() (OkH…
tejksat Oct 22, 2020
f648421
Fix potential stuck at UnixDomainSocket.read() (HttpClient transport)…
tejksat Nov 2, 2020
f0e0436
Use data's length value instead of calculating length once again
tejksat Nov 12, 2020
8dceafa
Let UnixSocketInputStream.read(..) return -1 when the socket is disco…
tejksat Nov 12, 2020
a3766f7
Move isConnected() check to the beginning of read(..) method
tejksat Nov 12, 2020
db86eab
Make UnixSocketInputStream.read() return -1 if EOF has been reached
tejksat Nov 12, 2020
6c7f942
Merge branch 'master' into alexander.koshevoy/preventFromBlockingOnRe…
bsideup Nov 16, 2020
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
29 changes: 9 additions & 20 deletions ...ansport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,30 +229,19 @@ class UnixSocketInputStream extends InputStream {

@Override
public int read(byte[] bytesEntry, int off, int len) throws IOException {
if (!isConnected()) {
return -1;
}
try {
if (off > 0) {
int bytes = 0;
int remainingLength = len;
int size;
byte[] data = new byte[(len < 10240) ? len : 10240];
do {
if (!isConnected()) {
return -1;
}
size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240);
if (size <= 0) {
return -1;
}
System.arraycopy(data, 0, bytesEntry, off, size);
bytes += size;
off += size;
remainingLength -= size;
} while ((remainingLength > 0) && (size > 0));
return bytes;
} else {
if (!isConnected()) {
int size = UnixDomainSocket.read(fd, data, data.length);
if (size <= 0) {
return -1;
}
System.arraycopy(data, 0, bytesEntry, off, size);
return size;
} else {
int size = UnixDomainSocket.read(fd, bytesEntry, len);
if (size <= 0) {
return -1;
Expand All @@ -268,7 +257,7 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException {
public int read() throws IOException {
byte[] bytes = new byte[1];
int bytesRead = read(bytes);
if (bytesRead == 0) {
if (bytesRead <= 0) {
return -1;
}
return bytes[0] & 0xff;
Expand Down
33 changes: 18 additions & 15 deletions ...er-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,24 +230,24 @@ class UnixSocketInputStream extends InputStream {

@Override
public int read(byte[] bytesEntry, int off, int len) throws IOException {
if (!isConnected()) {
return -1;
}
try {
if (off > 0) {
int bytes = 0;
int remainingLength = len;
int size;
byte[] data = new byte[(len < 10240) ? len : 10240];
do {
size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0);
if (size > 0) {
System.arraycopy(data, 0, bytesEntry, off, size);
bytes += size;
off += size;
remainingLength -= size;
}
} while ((remainingLength > 0) && (size > 0));
return bytes;
int size = recv(fd, data, data.length, 0);
if (size <= 0) {
return -1;
}
System.arraycopy(data, 0, bytesEntry, off, size);
return size;
} else {
return recv(fd, bytesEntry, len, 0);
int size = recv(fd, bytesEntry, len, 0);
if (size <= 0) {
return -1;
}
return size;
}
} catch (LastErrorException lee) {
throw new IOException("native read() failed : " + formatError(lee));
Expand All @@ -258,14 +258,17 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException {
public int read() throws IOException {
byte[] bytes = new byte[1];
int bytesRead = read(bytes);
if (bytesRead == 0) {
if (bytesRead <= 0) {
return -1;
}
return bytes[0] & 0xff;
}

@Override
public int read(byte[] bytes) throws IOException {
if (!isConnected()) {
return -1;
}
return read(bytes, 0, bytes.length);
}
}
Expand Down