Merge pull request #32182 from dongweiming/fix-ps

Fix psutil.cpu_times unpack error
saltstack · Mar 28, 2016 · c983974 · c983974
2 parents b60b6f9 + ea67120
commit c983974
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/salt/modules/ps.py b/salt/modules/ps.py
@@ -133,6 +133,8 @@ def top(num_processes=5, interval=3):
         try:
             process = psutil.Process(pid)
             user, system = process.cpu_times()
+        except ValueError:
+            user, system, _, _ = process.cpu_times()
         except psutil.NoSuchProcess:
             continue
         start_usage[process] = user + system
@@ -141,6 +143,8 @@ def top(num_processes=5, interval=3):
     for process, start in six.iteritems(start_usage):
         try:
             user, system = process.cpu_times()
+        except ValueError:
+            user, system, _, _ = process.cpu_times()
         except psutil.NoSuchProcess:
             continue
         now = user + system