From 9ed6901499c7ff4e66b282e535ed9e6af3a8b6a2 Mon Sep 17 00:00:00 2001
From: Lijia Liu <liutang123@yeah.net>
Date: Mon, 3 Mar 2025 11:02:49 +0800
Subject: [PATCH 1/2] [fix](broker) fix fd always timeout (#48494)

### What problem does this PR solve?

come from https://github.com/apache/doris/pull/28589

### Release note

None

### Check List (For Author)

- Test <!-- At least one of them must be included. -->
    - [ ] Regression test
    - [ ] Unit Test
    - [ ] Manual test (add detailed scripts or steps below)
    - [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
        - [ ] Previous test can cover this change.
        - [ ] No code files have been changed.
        - [ ] Other reason <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->

### Check List (For Reviewer who merge this PR)

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->

Co-authored-by: liutang123 <liulijia@gmail.com>
---
 .../apache/doris/broker/hdfs/ClientContextManager.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/ClientContextManager.java b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/ClientContextManager.java
index 2df4c12a7fda8d..8e2fcfe60de02f 100644
--- a/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/ClientContextManager.java
+++ b/fs_brokers/apache_hdfs_broker/src/main/java/org/apache/doris/broker/hdfs/ClientContextManager.java
@@ -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());
             }
         }
     }
@@ -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);
                     }

From 2c85c1f37fc56a3b6df776c4f3594d90cda7066b Mon Sep 17 00:00:00 2001
From: Dongyang Li <lidongyang@selectdb.com>
Date: Thu, 20 Mar 2025 11:13:42 +0800
Subject: [PATCH 2/2] [fix](ci) adjust thirdparth download url (#48551)

---
 .github/workflows/build-extension.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml
index 14998f24144b73..0c53abb1da3bfd 100644
--- a/.github/workflows/build-extension.yml
+++ b/.github/workflows/build-extension.yml
@@ -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