Merge "Handle disappearing pids in mlock_report.py"

tools/mlock_report.py

@@ -24,8 +24,6 @@ def _get_report():
         # iterate over the /proc/%pid/status files manually
         try:
             s = open("%s/%d/status" % (psutil.PROCFS_PATH, proc.pid), 'r')
-        except EnvironmentError:
-            continue
             with s:
                 for line in s:
                     result = LCK_SUMMARY_REGEX.search(line)
@@ -35,6 +33,10 @@ def _get_report():
                             mlock_users.append({'name': proc.name(),
                                                 'pid': proc.pid,
                                                 'locked': locked})
+        except OSError:
+            # pids can disappear, we're ok with that
+            continue
+
 
     # produce a single line log message with per process mlock stats
     if mlock_users: