commit 58728f40fe2a952416efb40012ccafb87c755742
author Prathmesh Prabhu <pprabhu@chromium.org> Mon May 07 14:37:35 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed May 09 14:39:57 2018 -0700
tree c01837bf0badabfa1e36b42cfc2ef561ac87f300
parent 6b48edefd74f028d5ffba82007cd4aaa743af476

lab_inventory: Flush metrics even in case of errors

This ensures that we will not drop metrics on the floor when exceptions
happen.

BUG=chromium:835941
TEST=None

Change-Id: Icbcb5e52e48b3eed4e5122906aab3772b844932f
Reviewed-on: https://chromium-review.googlesource.com/1048607
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@google.com>

site_utils/lab_inventory.py

diff --git a/site_utils/lab_inventory.py b/site_utils/lab_inventory.py
index 8060435..58b50b9 100755
--- a/site_utils/lab_inventory.py
+++ b/site_utils/lab_inventory.py
@@ -1322,18 +1322,19 @@
     else:
         metrics_file = None
 
-    try:
-        with site_utils.SetupTsMonGlobalState(
-                'lab_inventory', debug_file=metrics_file,
-                auto_flush=False):
+    with site_utils.SetupTsMonGlobalState(
+            'lab_inventory', debug_file=metrics_file,
+            auto_flush=False):
+        try:
             _perform_inventory_reports(arguments)
-        metrics.Flush()
-    except KeyboardInterrupt:
-        pass
-    except (EnvironmentError, Exception):
-        # Our cron setup doesn't preserve stderr, so drop extra breadcrumbs.
-        logging.exception('Error escaped main')
-        raise
+        except KeyboardInterrupt:
+            pass
+        except (EnvironmentError, Exception):
+            # Our cron setup doesn't preserve stderr, so drop extra breadcrumbs.
+            logging.exception('Error escaped main')
+            raise
+        finally:
+            metrics.Flush()
 
 
 def get_inventory(afe):