From 1943f3d49aaa84fb51e94a54f4ff531a9ea3d574 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Fri, 25 Oct 2019 14:49:51 +0800
Subject: [PATCH] upgrade version to V6.0.1

---
 fastdfs.spec          |  2 +-
 storage/storage_nio.c | 39 +++++++++++++++++++++++++--------------
 tracker/tracker_nio.c | 33 ++++++++++++++++++++++-----------
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/fastdfs.spec b/fastdfs.spec
index 04268f2..7431efa 100644
--- a/fastdfs.spec
+++ b/fastdfs.spec
@@ -3,7 +3,7 @@
 %define FDFSClient libfdfsclient
 %define FDFSClientDevel libfdfsclient-devel
 %define FDFSTool   fastdfs-tool
-%define FDFSVersion 6.0.0
+%define FDFSVersion 6.0.1
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: %{FastDFS}
diff --git a/storage/storage_nio.c b/storage/storage_nio.c
index 466b4ad..aa8c58f 100644
--- a/storage/storage_nio.c
+++ b/storage/storage_nio.c
@@ -267,23 +267,34 @@ static void client_sock_read(int sock, short event, void *arg)
 
 	if (event & IOEVENT_TIMEOUT)
 	{
-		if (pClientInfo->total_offset == 0 && pTask->req_count > 0)
+		if (pClientInfo->total_offset == 0)
 		{
-			pTask->event.timer.expires = g_current_time +
-				g_fdfs_network_timeout;
-			fast_timer_add(&pTask->thread_data->timer,
-				&pTask->event.timer);
+            if (pTask->req_count > 0)
+            {
+                pTask->event.timer.expires = g_current_time +
+                    g_fdfs_network_timeout;
+                fast_timer_add(&pTask->thread_data->timer,
+                        &pTask->event.timer);
+            }
+            else
+            {
+                logWarning("file: "__FILE__", line: %d, "
+                        "client ip: %s, recv timeout. "
+                        "after the connection is established, "
+                        "you must send a request before %ds timeout",
+                        __LINE__, pTask->client_ip, g_fdfs_network_timeout);
+                task_finish_clean_up(pTask);
+            }
 		}
 		else
-		{
-			logError("file: "__FILE__", line: %d, " \
-				"client ip: %s, recv timeout, " \
-				"recv offset: %d, expect length: %d", \
-				__LINE__, pTask->client_ip, \
-				pTask->offset, pTask->length);
-
-			task_finish_clean_up(pTask);
-		}
+        {
+            logError("file: "__FILE__", line: %d, "
+                    "client ip: %s, recv timeout, "
+                    "recv offset: %d, expect length: %d, "
+                    "req_count: %"PRId64, __LINE__, pTask->client_ip,
+                    pTask->offset, pTask->length, pTask->req_count);
+            task_finish_clean_up(pTask);
+        }
 
 		return;
 	}
diff --git a/tracker/tracker_nio.c b/tracker/tracker_nio.c
index 51b1f24..36a2a46 100644
--- a/tracker/tracker_nio.c
+++ b/tracker/tracker_nio.c
@@ -198,21 +198,32 @@ static void client_sock_read(int sock, short event, void *arg)
 
 	if (event & IOEVENT_TIMEOUT)
 	{
-		if (pTask->offset == 0 && pTask->req_count > 0)
+		if (pTask->offset == 0)
 		{
-			pTask->event.timer.expires = g_current_time +
-				g_fdfs_network_timeout;
-			fast_timer_add(&pTask->thread_data->timer,
-				&pTask->event.timer);
+            if (pTask->req_count > 0)
+            {
+                pTask->event.timer.expires = g_current_time +
+                    g_fdfs_network_timeout;
+                fast_timer_add(&pTask->thread_data->timer,
+                        &pTask->event.timer);
+            }
+            else
+            {
+                logWarning("file: "__FILE__", line: %d, "
+                        "client ip: %s, recv timeout. "
+                        "after the connection is established, "
+                        "you must send a request before %ds timeout",
+                        __LINE__, pTask->client_ip, g_fdfs_network_timeout);
+                task_finish_clean_up(pTask);
+            }
 		}
 		else
 		{
-			logError("file: "__FILE__", line: %d, " \
-				"client ip: %s, recv timeout, " \
-				"recv offset: %d, expect length: %d", \
-				__LINE__, pTask->client_ip, \
-				pTask->offset, pTask->length);
-
+			logError("file: "__FILE__", line: %d, "
+				"client ip: %s, recv timeout, "
+				"recv offset: %d, expect length: %d, "
+                "req_count: %"PRId64, __LINE__, pTask->client_ip,
+				pTask->offset, pTask->length, pTask->req_count);
 			task_finish_clean_up(pTask);
 		}