This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 9cf3b4671db branch-2.1: [fix](broker) fix fd always timeout #48494
(#48522)
9cf3b4671db is described below
commit 9cf3b4671db02f68cd984278c36a49cfe74f537b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 3 18:15:10 2025 +0800
branch-2.1: [fix](broker) fix fd always timeout #48494 (#48522)
Cherry-picked from #48494
Co-authored-by: Lijia Liu <liutang...@yeah.net>
Co-authored-by: liutang123 <liuli...@gmail.com>
Co-authored-by: Dongyang Li <lidongy...@selectdb.com>
---
.../org/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 2df4c12a7fd..8e2fcfe60de 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 class ClientContextManager {
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 class ClientContextManager {
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
