Assure that update_X give dedicated return codes for SIGTERM exit

MaptimeBogota · May 18, 2023 · fbb7d91 · fbb7d91
1 parent 8eaac3d
commit fbb7d91
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/src/overpass_api/osm-backend/update_database.cc b/src/overpass_api/osm-backend/update_database.cc
@@ -146,6 +146,8 @@ int main(int argc, char* argv[])
   catch (File_Error e)
   {
     report_file_error(e);
+    if (sigterm_status())
+      return SIGTERM;
     return 2;
   }
 

diff --git a/src/overpass_api/osm-backend/update_from_dir.cc b/src/overpass_api/osm-backend/update_from_dir.cc
@@ -184,6 +184,8 @@ int main(int argc, char* argv[])
   catch (const File_Error& e)
   {
     report_file_error(e);
+    if (sigterm_status())
+      return SIGTERM;
     return -1;
   }
 

diff --git a/src/template_db/dispatcher.cc b/src/template_db/dispatcher.cc
@@ -671,7 +671,7 @@ void Dispatcher::standby_loop(uint64 milliseconds)
 
     uint32 command = 0;
     uint32 client_pid = 0;
-    if (sigterm_status())
+    if (sigterm_status() == Signal_Status::received)
       command = TERMINATE;
     else
       connection_per_pid.poll_command_round_robin(command, client_pid);
@@ -695,10 +695,12 @@ void Dispatcher::standby_loop(uint64 milliseconds)
     {
       if (terminate_countdown < TERMINATE_COUNTDOWN_START)
       {
-          if (logger)
-            logger->terminate_triggered(terminate_countdown, writing_process);
-        if (--terminate_countdown == 0 || writing_process == 0)
+        if (!terminate_countdown || !writing_process)
+        {
+          logger->terminate_triggered(terminate_countdown, writing_process);
           break;
+        }
+        --terminate_countdown;
 
         if (command == WRITE_ROLLBACK)
         {
@@ -725,11 +727,12 @@ void Dispatcher::standby_loop(uint64 milliseconds)
 
 	if (command == TERMINATE)
         {
+          --terminate_countdown;
           if (logger)
             logger->terminate_triggered(terminate_countdown, writing_process);
           if (writing_process)
             kill(writing_process, SIGTERM);
-	  --terminate_countdown;
+          sigterm_status() = Signal_Status::processed;
         }
       }
       else if (command == WRITE_START || command == WRITE_COMMIT

diff --git a/src/template_db/dispatcher.h b/src/template_db/dispatcher.h
@@ -177,7 +177,7 @@ class Dispatcher
     static const int OFFSET_DB_1 = OFFSET_BACK+12;
     static const int OFFSET_DB_2 = OFFSET_DB_1+(256+4);
 
-    static const int32 TERMINATE_COUNTDOWN_START = 100;
+    static const int32 TERMINATE_COUNTDOWN_START = 501;
 
     static const uint32 TERMINATE = 1;
     static const uint32 OUTPUT_STATUS = 2;

diff --git a/src/template_db/types.cc b/src/template_db/types.cc
@@ -69,16 +69,16 @@ int& global_read_counter()
 }
 
 
-bool& sigterm_status()
+Signal_Status& sigterm_status()
 {
-  static bool status = false;
+  static Signal_Status status = Signal_Status::absent;
   return status;
 }
 
 
 void sigterm(int)
 {
-  sigterm_status() = true;
+  sigterm_status() = Signal_Status::received;
 }
 
 

diff --git a/src/template_db/types.h b/src/template_db/types.h
@@ -359,7 +359,8 @@ inline void zero_padding(uint8* from, uint32 bytes)
 
 int& global_read_counter();
 
-bool& sigterm_status();
+enum Signal_Status { absent = 0, received, processed };
+Signal_Status& sigterm_status();
 void sigterm(int);