Skip to content

branch-3.0: [fix](broker) fix fd always timeout #48494 #48551 #48521

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
morningman merged 3 commits into from
May 14, 2025
Merged

branch-3.0: [fix](broker) fix fd always timeout #48494 #48551 #48521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ed6901
[fix](broker) fix fd always timeout (#48494)
liutang123 Mar 3, 2025
139a78c
Merge branch 'branch-3.0' into auto-pick-48494-branch-3.0
cambyzju Mar 21, 2025
2c85c1f
[fix](ci) adjust thirdparth download url (#48551)
hello-stephen Mar 20, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build-extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
pushd thirdparty
branch="${{ github.base_ref }}"
if [[ -z "${branch}" ]] || [[ "${branch}" == 'master' ]]; then
if [[ -z "${branch}" ]] || [[ "${branch}" == 'master' || "${branch}" == 'branch-3.0' || "${branch}" == 'branch-2.1' ]]; then
curl -L https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-linux-x86_64.tar.xz \
-o doris-thirdparty-prebuilt-linux-x86_64.tar.xz
else
Expand Down
10 changes: 5 additions & 5 deletions ...s/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/ClientContextManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ public synchronized void remoteExpireInputStreams() {
fd = entry.getKey();
if (entry.getValue().checkExpire(inputStreamExpireSeconds)) {
ClientContextManager.this.removeInputStream(fd);
iter.remove();
logger.info(fd + " in client [" + clientContext.clientId
+ "] is expired, remove it from contexts. last update time is "
+ entry.getValue().getLastPingTimestamp());
}
iter.remove();
logger.info(fd + " in client [" + clientContext.clientId
+ "] is expired, remove it from contexts. last update time is "
+ entry.getValue().getLastPingTimestamp());
}
}
}
Expand All @@ -167,7 +167,7 @@ public void run() {
ClientContextManager.this.removeOutputStream(fd);
}
clientContexts.remove(clientContext.clientId);
logger.info("client [" + clientContext.clientId
logger.info("client [" + clientContext.clientId
+ "] is expired, remove it from contexts. last access time is "
+ clientContext.lastAccessTimestamp);
}
Expand Down
Loading