commit 447ad9d610433e6d34e4db04057357ef9f73a0f2
author xixuan <xixuan@chromium.org> Tue Feb 28 14:46:20 2017 -0800
committer Xixuan Wu <xixuan@chromium.org> Wed Mar 01 04:21:07 2017 +0000
tree b324644a3284991ba981e83b597f6387b17bac2d
parent ac89ce8102fd57983e4e1513f2b329f65c0bbc05

devserver: add ongoing au process number check in check_health.

This CL mainly does:
1. Add checking the number of current background au processes in
check_healthy devserver call.
2. Force kill_au_proc to kill the au process if the process's pid is
passed.

BUG=chromium:696606
TEST=Run local devserver and call check_health & kill_au_proc.

Change-Id: I4fe44407b85659bd3aab309ac8efe11b0b457f68
Reviewed-on: https://chromium-review.googlesource.com/447821
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Xixuan Wu <xixuan@chromium.org>
Tested-by: Xixuan Wu <xixuan@chromium.org>

devserver.py

diff --git a/devserver.py b/devserver.py
index 8ab9d68..5f8b055 100755
--- a/devserver.py
+++ b/devserver.py
@@ -533,6 +533,7 @@
   else:
     return False
 
+
 def _parse_string_arg(kwargs, key):
   """Parse string arg from kwargs.
 
@@ -548,6 +549,7 @@
   else:
     return None
 
+
 def _build_uri_from_build_name(build_name):
   """Get build url from a given build name.
 
@@ -562,6 +564,26 @@
       cros_update.STABLE_BUILD_CHANNEL, build_name.split('/')[0],
       build_name.split('/')[1])
 
+
+def _clear_process(host_name, pid):
+  """Clear AU process for given hostname and pid.
+
+  This clear includes:
+    1. kill process if it's alive.
+    2. delete the track status file of this process.
+    3. delete the executing log file of this process.
+
+  Args:
+    host_name: the host to execute auto-update.
+    pid: the background auto-update process id.
+  """
+  if cros_update_progress.IsProcessAlive(pid):
+    os.killpg(int(pid), signal.SIGKILL)
+
+  cros_update_progress.DelTrackStatusFile(host_name, pid)
+  cros_update_progress.DelExecuteLogFile(host_name, pid)
+
+
 class ApiRoot(object):
   """RESTful API for Dev Server information."""
   exposed = True
@@ -1021,6 +1043,8 @@
     if 'host_name' not in kwargs:
       raise common_util.DevServerHTTPError((KEY_ERROR_MSG % 'host_name'))
 
+    cur_pid = kwargs.get('pid')
+
     host_name = kwargs['host_name']
     track_log_list = cros_update_progress.GetAllTrackStatusFileByHostName(
         host_name)
@@ -1029,11 +1053,10 @@
       # Use splitext to remove file extension, then parse pid from the
       # filename.
       pid = os.path.splitext(os.path.basename(log))[0][len(host_name)+1:]
-      if cros_update_progress.IsProcessAlive(pid):
-        os.killpg(int(pid), signal.SIGKILL)
+      _clear_process(host_name, pid)
 
-      cros_update_progress.DelTrackStatusFile(host_name, pid)
-      cros_update_progress.DelExecuteLogFile(host_name, pid)
+    if cur_pid:
+      _clear_process(host_name, cur_pid)
 
     return 'True'
 
@@ -1606,13 +1629,16 @@
     apache_client_count = self._get_process_count('apache')
     telemetry_test_count = self._get_process_count('python.*telemetry')
     gsutil_count = self._get_process_count('gsutil')
+    au_process_count = len(cros_update_progress.GetAllRunningAUProcess())
 
     health_data = {
         'free_disk': free_disk,
         'staging_thread_count': DevServerRoot._staging_thread_count,
         'apache_client_count': apache_client_count,
         'telemetry_test_count': telemetry_test_count,
-        'gsutil_count': gsutil_count}
+        'gsutil_count': gsutil_count,
+        'au_process_count': au_process_count,
+    }
     health_data.update(self._get_io_stats() or {})
 
     return json.dumps(health_data)