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
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);
                     }