From 98036d544f29ec8cb0d8ef4dba0d8c39d63b70cd Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Fri, 5 Feb 2021 15:47:15 +0800
Subject: [PATCH] fix bu

---
 src/util/src/tlog.c | 54 ++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c
index 462d074398..ace97438f2 100644
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@@ -34,7 +34,7 @@
 #define LOG_INTERVAL_STEP 5000
 #define MIN_LOG_INTERVAL 5000
 #define MAX_LOG_INTERVAL 50000
-
+#define LOG_MAX_WAIT_USEC 1000000
 
 #define LOG_BUF_BUFFER(x) ((x)->buffer)
 #define LOG_BUF_START(x)  ((x)->buffStart)
@@ -47,6 +47,7 @@ typedef struct {
   int32_t         buffStart;
   int32_t         buffEnd;
   int32_t         buffSize;
+  int32_t         minBuffSize;
   int32_t         fd;
   int32_t         stop;
   pthread_t       asyncThread;
@@ -516,6 +517,7 @@ static SLogBuff *taosLogBuffNew(int32_t bufSize) {
 
   LOG_BUF_START(tLogBuff) = LOG_BUF_END(tLogBuff) = 0;
   LOG_BUF_SIZE(tLogBuff) = bufSize;
+  tLogBuff->minBuffSize = bufSize / 10;
   tLogBuff->stop = 0;
 
   if (pthread_mutex_init(&LOG_BUF_MUTEX(tLogBuff), NULL) < 0) goto _err;
@@ -603,41 +605,52 @@ static int32_t taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int32_t msgLen)
   return 0;
 }
 
-static int32_t taosGetLogRemainSize(SLogBuff *tLogBuff) {
-  int32_t start = LOG_BUF_START(tLogBuff);
-  int32_t end = LOG_BUF_END(tLogBuff);
+static int32_t taosGetLogRemainSize(SLogBuff *tLogBuff, int32_t start, int32_t end) {
   int32_t rSize = end - start;
 
   return rSize >= 0 ? rSize : LOG_BUF_SIZE(tLogBuff) + rSize;
 }
 
 static void taosWriteLog(SLogBuff *tLogBuff) {
+  static int32_t lastDuration = 0;
+  int32_t remainChecked = 0;
+  int32_t start, end, pollSize;
+  
   do {
-    int32_t start = LOG_BUF_START(tLogBuff);
-    int32_t end = LOG_BUF_END(tLogBuff);
-    int32_t pollSize = 0;
+    if (remainChecked == 0) {
+      start = LOG_BUF_START(tLogBuff);
+      end = LOG_BUF_END(tLogBuff);
+
+      if (start == end) {
+        dbgEmptyW++;
+        writeInterval = MAX_LOG_INTERVAL;
+        return;
+      }
 
-    if (start == end) {
-      dbgEmptyW++;
-      writeInterval = MAX_LOG_INTERVAL;
-      return;
-    } else if (start < end) {
-      pollSize = end - start;
+      pollSize = taosGetLogRemainSize(tLogBuff, start, end);
+      if (pollSize < tLogBuff->minBuffSize) {
+        lastDuration += writeInterval;
+        if (lastDuration < LOG_MAX_WAIT_USEC) {
+          break;
+        }
+      }
 
+      lastDuration = 0;
+    }
+
+    if (start < end) {
       taosWrite(tLogBuff->fd, LOG_BUF_BUFFER(tLogBuff) + start, pollSize);
     } else {
         int32_t tsize = LOG_BUF_SIZE(tLogBuff) - start;
         taosWrite(tLogBuff->fd, LOG_BUF_BUFFER(tLogBuff) + start, tsize);
 
         taosWrite(tLogBuff->fd, LOG_BUF_BUFFER(tLogBuff), end);
-
-        pollSize = tsize + end;
     }
 
     dbgWN++;
     dbgWSize+=pollSize;
     
-    if (pollSize < LOG_BUF_SIZE(tLogBuff)/10) {
+    if (pollSize < tLogBuff->minBuffSize) {
       dbgSmallWN++;
       if (writeInterval < MAX_LOG_INTERVAL) {
         writeInterval += LOG_INTERVAL_STEP;
@@ -651,12 +664,17 @@ static void taosWriteLog(SLogBuff *tLogBuff) {
 
     LOG_BUF_START(tLogBuff) = (LOG_BUF_START(tLogBuff) + pollSize) % LOG_BUF_SIZE(tLogBuff);
 
-    int32_t rsize = taosGetLogRemainSize(tLogBuff);
-    if (rsize < 1048576) {
+    start = LOG_BUF_START(tLogBuff);
+    end = LOG_BUF_END(tLogBuff);
+
+    int32_t pollSize = taosGetLogRemainSize(tLogBuff, start, end);
+    if (pollSize < tLogBuff->minBuffSize) {
       break;
     }
 
     writeInterval = MIN_LOG_INTERVAL;
+
+    remainChecked = 1;
   }while (1);
 }
 
-- 
GitLab