-
Notifications
You must be signed in to change notification settings - Fork 16
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
Set a small socket timeout before closing partially consumed responses #1853
Draft
carterkozak
wants to merge
3
commits into
develop
Choose a base branch
from
ckozak/terrible_hack_socket_timeout
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
type: improvement | ||
improvement: | ||
description: Set a small socket timeout before closing partially consumed responses | ||
links: | ||
- https://github.com/palantir/dialogue/pull/1853 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
type: improvement | ||
improvement: | ||
description: Set a small socket timeout before closing partially consumed responses | ||
links: | ||
- https://github.com/palantir/dialogue/pull/1853 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...e-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ConnectionEndpointAccess.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* (c) Copyright 2023 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.palantir.dialogue.hc5; | ||
|
||
import com.palantir.logsafe.logger.SafeLogger; | ||
import com.palantir.logsafe.logger.SafeLoggerFactory; | ||
import java.lang.reflect.InvocationTargetException; | ||
import java.lang.reflect.Method; | ||
import javax.annotation.Nullable; | ||
import org.apache.hc.client5.http.classic.ExecRuntime; | ||
import org.apache.hc.client5.http.io.ConnectionEndpoint; | ||
|
||
final class ConnectionEndpointAccess { | ||
|
||
private static final SafeLogger log = SafeLoggerFactory.get(ConnectionEndpointAccess.class); | ||
|
||
private static final String INTERNAL_EXEC_RUNTIME_FQCN = | ||
"org.apache.hc.client5.http.impl.classic.InternalExecRuntime"; | ||
|
||
@Nullable | ||
private static final Class<? extends ExecRuntime> INTERNAL_EXEC_RUNTIME_CLASS = findInternalExecRuntime(); | ||
|
||
@Nullable | ||
private static final Method ENSURE_VALID_METHOD = findEnsureValid(INTERNAL_EXEC_RUNTIME_CLASS); | ||
|
||
@Nullable | ||
static ConnectionEndpoint getConnectionEndpoint(@Nullable ExecRuntime runtime) { | ||
if (ENSURE_VALID_METHOD != null | ||
&& INTERNAL_EXEC_RUNTIME_CLASS != null | ||
&& INTERNAL_EXEC_RUNTIME_CLASS.isInstance(runtime)) { | ||
try { | ||
return (ConnectionEndpoint) ENSURE_VALID_METHOD.invoke(runtime); | ||
} catch (InvocationTargetException e) { | ||
if (e.getCause() instanceof IllegalStateException) { | ||
log.debug("Connection not acquired or already released", e); | ||
} else { | ||
log.warn("Failed to extract a ConnectionEndpoint from ExecRuntime", e); | ||
} | ||
} catch (Throwable t) { | ||
log.warn("Failed to extract a ConnectionEndpoint from ExecRuntime", t); | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
@Nullable | ||
@SuppressWarnings("unchecked") | ||
private static Class<? extends ExecRuntime> findInternalExecRuntime() { | ||
try { | ||
return (Class<? extends ExecRuntime>) | ||
Class.forName(INTERNAL_EXEC_RUNTIME_FQCN, false, ExecRuntime.class.getClassLoader()); | ||
} catch (ClassNotFoundException e) { | ||
return null; | ||
} | ||
} | ||
|
||
@Nullable | ||
private static Method findEnsureValid(@Nullable Class<? extends ExecRuntime> internalExecRuntime) { | ||
if (internalExecRuntime != null) { | ||
try { | ||
Method method = internalExecRuntime.getDeclaredMethod("ensureValid"); | ||
method.setAccessible(true); | ||
return method; | ||
} catch (Throwable t) { | ||
log.info("Failed to load the 'ensureValid' method on InternalExecRuntime", t); | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
private ConnectionEndpointAccess() {} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we set this to 0 so that the deplete
tryToRead
arg is falseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so -- that would only skip the single-byte read call, not the
skip
where most of the time is spent in a loop (with potentially no timeout)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, makes sense so we should expect the skip to timeout after 1ms with no bytes