From e56870bdd8e585dfa81bfc5b6b3cbaab2b560d81 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Sun, 28 Jun 2026 10:09:16 +0800 Subject: [PATCH] ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ALL protocol changed --- HISTORY | 4 ++ pom.xml | 2 +- .../org/csource/fastdfs/TrackerClient.java | 45 ++++++++++--------- .../fastdfs/pool/ConnectionManager.java | 2 +- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/HISTORY b/HISTORY index e9b7279..8a58cd8 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,8 @@ +Version 1.40 2026-06-28 + * ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ALL protocol changed + you must upgrade your FastDFS server V6.16.0 and higher version + Version 1.39 2025-12-19 * ConnectionPool.getKey() use '-' instead of ':' * ConnectionManager.java: remove private AtomicInteger freeCount diff --git a/pom.xml b/pom.xml index bc01685..8ec04cc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.csource fastdfs-client-java - 1.39-SNAPSHOT + 1.40-SNAPSHOT fastdfs-client-java fastdfs client for java jar diff --git a/src/main/java/org/csource/fastdfs/TrackerClient.java b/src/main/java/org/csource/fastdfs/TrackerClient.java index 1e2c6ab..1e2cc6e 100644 --- a/src/main/java/org/csource/fastdfs/TrackerClient.java +++ b/src/main/java/org/csource/fastdfs/TrackerClient.java @@ -353,7 +353,8 @@ public class TrackerClient { * @return storage server Socket object, return null if fail */ public StorageServer getFetchStorage(TrackerServer trackerServer, - String groupName, String filename) throws IOException, MyException { + String groupName, String filename) throws IOException, MyException + { ServerInfo[] servers = this.getStorages(trackerServer, ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ONE, groupName, filename); if (servers == null) { @@ -372,7 +373,8 @@ public class TrackerClient { * @return storage server Socket object, return null if fail */ public StorageServer getUpdateStorage(TrackerServer trackerServer, - String groupName, String filename) throws IOException, MyException { + String groupName, String filename) throws IOException, MyException + { ServerInfo[] servers = this.getStorages(trackerServer, ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_UPDATE, groupName, filename); if (servers == null) { @@ -391,7 +393,8 @@ public class TrackerClient { * @return storage servers, return null if fail */ public ServerInfo[] getFetchStorages(TrackerServer trackerServer, - String groupName, String filename) throws IOException, MyException { + String groupName, String filename) throws IOException, MyException + { return this.getStorages(trackerServer, ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ALL, groupName, filename); } @@ -400,14 +403,17 @@ public class TrackerClient { * query storage server to download file * * @param trackerServer the tracker server - * @param cmd command code, ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ONE or - * ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_UPDATE + * @param cmd command code, values list: + * ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ONE + * ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_FETCH_ALL + * ProtoCommon.TRACKER_PROTO_CMD_SERVICE_QUERY_UPDATE * @param groupName the group name of storage server * @param filename filename on storage server * @return storage server Socket object, return null if fail */ - protected ServerInfo[] getStorages(TrackerServer trackerServer, - byte cmd, String groupName, String filename) throws IOException, MyException { + protected ServerInfo[] getStorages(TrackerServer trackerServer, byte cmd, + String groupName, String filename) throws IOException, MyException + { byte[] header; byte[] bFileName; byte[] bGroupName; @@ -454,33 +460,32 @@ public class TrackerClient { if ((pkgInfo.body.length >= ProtoCommon.TRACKER_QUERY_STORAGE_FETCH_IPV6_BODY_LEN) && (pkgInfo.body.length - ProtoCommon.TRACKER_QUERY_STORAGE_FETCH_IPV6_BODY_LEN) % - (ProtoCommon.FDFS_IPV6_SIZE - 1) == 0) + (ProtoCommon.FDFS_IPV6_SIZE - 1 + ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE) == 0) { ip_size = ProtoCommon.FDFS_IPV6_SIZE; server_count += (pkgInfo.body.length - ProtoCommon.TRACKER_QUERY_STORAGE_FETCH_IPV6_BODY_LEN) / - (ProtoCommon.FDFS_IPV6_SIZE - 1); + (ProtoCommon.FDFS_IPV6_SIZE - 1 + ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE); } else if ((pkgInfo.body.length - ProtoCommon.TRACKER_QUERY_STORAGE_FETCH_IPV4_BODY_LEN) % - (ProtoCommon.FDFS_IPV4_SIZE - 1) == 0) + (ProtoCommon.FDFS_IPV4_SIZE - 1 + ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE) == 0) { ip_size = ProtoCommon.FDFS_IPV4_SIZE; server_count += (pkgInfo.body.length - ProtoCommon.TRACKER_QUERY_STORAGE_FETCH_IPV4_BODY_LEN) / - (ProtoCommon.FDFS_IPV4_SIZE - 1); + (ProtoCommon.FDFS_IPV4_SIZE - 1 + ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE); } else { this.errno = ProtoCommon.ERR_NO_EINVAL; throw new IOException("Invalid body length: " + pkgInfo.body.length); } - ip_addr = new String(pkgInfo.body, ProtoCommon.FDFS_GROUP_NAME_MAX_LEN, ip_size - 1).trim(); - int offset = ProtoCommon.FDFS_GROUP_NAME_MAX_LEN + ip_size - 1; - - port = (int) ProtoCommon.buff2long(pkgInfo.body, offset); - offset += ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE; - + int offset = ProtoCommon.FDFS_GROUP_NAME_MAX_LEN; ServerInfo[] servers = new ServerInfo[server_count]; - servers[0] = new ServerInfo(ip_addr, port); - for (int i = 1; i < server_count; i++) { - servers[i] = new ServerInfo(new String(pkgInfo.body, offset, ip_size - 1).trim(), port); + for (int i = 0; i < server_count; i++) { + ip_addr = new String(pkgInfo.body, offset, ip_size - 1).trim(); offset += ip_size - 1; + + port = (int) ProtoCommon.buff2long(pkgInfo.body, offset); + offset += ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE; + + servers[i] = new ServerInfo(ip_addr, port); } return servers; diff --git a/src/main/java/org/csource/fastdfs/pool/ConnectionManager.java b/src/main/java/org/csource/fastdfs/pool/ConnectionManager.java index 2dc0a30..147174a 100644 --- a/src/main/java/org/csource/fastdfs/pool/ConnectionManager.java +++ b/src/main/java/org/csource/fastdfs/pool/ConnectionManager.java @@ -126,9 +126,9 @@ public class ConnectionManager { connection.closeDirectly(); } } catch (IOException e) { + e.printStackTrace(); System.err.println("close socket[" + inetSocketAddress.getAddress().getHostAddress() + ":" + inetSocketAddress.getPort() + "] error, emsg: " + e.getMessage()); - e.printStackTrace(); } }