From 829caf39d38be113774ae236ba737c3d902cff52 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Thu, 27 Aug 2020 10:07:58 +0800
Subject: [PATCH] td-1242: wait again if sem_wait returns EINTR

---
 src/dnode/src/dnodeSystem.c    |  7 ++-----
 src/os/inc/osSemphone.h        |  2 +-
 src/os/src/detail/osSemphone.c | 12 ++++++++++++
 src/sync/src/tarbitrator.c     |  4 +---
 src/util/src/tsched.c          | 13 ++-----------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index b286c0f219..56316e9619 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -119,11 +119,8 @@ int32_t main(int32_t argc, char *argv[]) {
 
   syslog(LOG_INFO, "Started TDengine service successfully.");
 
-  for (int res = tsem_wait(&exitSem); res != 0; res = tsem_wait(&exitSem)) {
-    if (errno != EINTR) {
-      syslog(LOG_ERR, "failed to wait exit semphore: %s", strerror(errno));
-      break;
-    }
+  if (tsem_wait(&exitSem) != 0) {
+    syslog(LOG_ERR, "failed to wait exit semphore: %s", strerror(errno));
   }
 
   dnodeCleanUpSystem();
diff --git a/src/os/inc/osSemphone.h b/src/os/inc/osSemphone.h
index fd88d2d798..4280b458a6 100644
--- a/src/os/inc/osSemphone.h
+++ b/src/os/inc/osSemphone.h
@@ -23,7 +23,7 @@ extern "C" {
 #ifndef TAOS_OS_FUNC_SEMPHONE
   #define tsem_t sem_t
   #define tsem_init sem_init
-  #define tsem_wait sem_wait
+  int tsem_wait(tsem_t* sem);
   #define tsem_post sem_post
   #define tsem_destroy sem_destroy
 #endif
diff --git a/src/os/src/detail/osSemphone.c b/src/os/src/detail/osSemphone.c
index 74f8859029..b91888845e 100644
--- a/src/os/src/detail/osSemphone.c
+++ b/src/os/src/detail/osSemphone.c
@@ -16,6 +16,18 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 
+#ifndef TAOS_OS_FUNC_SEMPHONE
+
+int tsem_wait(tsem_t* sem) {
+  int ret = 0;
+  do {
+    ret = sem_wait(sem);
+  } while (ret != 0 && errno == EINTR);
+  return ret;
+}
+
+#endif
+
 #ifndef TAOS_OS_FUNC_SEMPHONE_PTHREAD
 
 bool    taosCheckPthreadValid(pthread_t thread) { return thread != 0; }
diff --git a/src/sync/src/tarbitrator.c b/src/sync/src/tarbitrator.c
index 79ddb073de..eea46a2495 100644
--- a/src/sync/src/tarbitrator.c
+++ b/src/sync/src/tarbitrator.c
@@ -103,9 +103,7 @@ int main(int argc, char *argv[]) {
 
   sInfo("TAOS arbitrator: %s:%d is running", tsNodeFqdn, tsArbitratorPort);
 
-  for (int res = tsem_wait(&tsArbSem); res != 0; res = tsem_wait(&tsArbSem)) {
-    if (errno != EINTR) break;
-  }
+  tsem_wait(&tsArbSem);
 
   taosCloseTcpThreadPool(tsArbTcpPool);
   sInfo("TAOS arbitrator is shut down\n");
diff --git a/src/util/src/tsched.c b/src/util/src/tsched.c
index cf7f5c10d4..f014dd0fab 100644
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
@@ -123,11 +123,6 @@ void *taosProcessSchedQueue(void *param) {
 
   while (1) {
     if (tsem_wait(&pSched->fullSem) != 0) {
-      if (errno == EINTR) {
-        /* sem_wait is interrupted by interrupt, ignore and continue */
-        uDebug("wait %s fullSem was interrupted", pSched->label);
-        continue;
-      }
       uError("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
     }
     if (pSched->stop) {
@@ -163,12 +158,8 @@ int taosScheduleTask(void *qhandle, SSchedMsg *pMsg) {
     return 0;
   }
 
-  while (tsem_wait(&pSched->emptySem) != 0) {
-    if (errno != EINTR) {
-      uError("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
-      break;
-    }
-    uDebug("wait %s emptySem was interrupted", pSched->label);
+  if (tsem_wait(&pSched->emptySem) != 0) {
+    uError("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
   }
 
   if (pthread_mutex_lock(&pSched->queueMutex) != 0)
-- 
GitLab