Hold lock until children have been killed

thread · May 27, 2022 · 563b89f · 563b89f
1 parent 0f2e9aa
commit 563b89f
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/pipelinewise/cli/pipelinewise.py b/pipelinewise/cli/pipelinewise.py
@@ -1293,25 +1293,12 @@ def stop_tap(self, sig=None, frame=None):
         a SIGTERM to the process.
         """
         self.logger.info('Trying to stop tap gracefully...')
-        pidfile_path = self.tap['files']['pidfile']
-
-        # Rename log files from running to terminated status
-        if self.tap_run_log_file:
-            tap_run_log_file_running = f'{self.tap_run_log_file}.running'
-            tap_run_log_file_terminated = f'{self.tap_run_log_file}.terminated'
-
-            try:
-                os.rename(tap_run_log_file_running, tap_run_log_file_terminated)
-            except FileNotFoundError:
-                self.logger.warning(
-                    'No logfile found at %s.', tap_run_log_file_running
-                )
 
-        # Get PID from pidfile and remove the file.
+        # Get PID from pidfile.
+        pidfile_path = self.tap['files']['pidfile']
         try:
             with open(pidfile_path, encoding='utf-8') as pidf:
                 pid = int(pidf.read())
-            os.remove(pidfile_path)
         except FileNotFoundError:
             self.logger.error(
                 'No pidfile found at %s. Tap does not seem to be running.', pidfile_path
@@ -1332,13 +1319,27 @@ def stop_tap(self, sig=None, frame=None):
                         child.wait(timeout=1)
                     except psutil.TimeoutExpired:
                         child.kill()
-
         except ProcessLookupError:
             self.logger.error(
                 'Pid %s not found. Is the tap running on this machine? '
                 'Stopping taps remotely is not supported.',
                 pid,
             )
+        finally:
+            # Remove PID file
+            os.remove(pidfile_path)
+
+            # Rename log files from running to terminated status
+            if self.tap_run_log_file:
+                tap_run_log_file_running = f'{self.tap_run_log_file}.running'
+                tap_run_log_file_terminated = f'{self.tap_run_log_file}.terminated'
+
+                try:
+                    os.rename(tap_run_log_file_running, tap_run_log_file_terminated)
+                except FileNotFoundError:
+                    self.logger.warning(
+                        'No logfile found at %s.', tap_run_log_file_running
+                    )
 
     # pylint: disable=too-many-locals
     def sync_tables(self):