commit 9402c294f957c375788e2949e84f3bf34cd8f1c7
author Michael Mortensen <mmortensen@google.com> Tue Jun 16 14:01:45 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Jun 17 01:32:03 2020 +0000
tree f14f12fa7a98833e2290dbfc4deff3102cb05d82
parent 1d0258bc2d3f2b9baf6a8ccce8fb7985ed43df3f

locking: Add better logging around unmount chroot.

BUG=chromium:1095661
TEST=manual, ./run_pytest

Change-Id: I46fa1885a42ee9ee734b04e1a553cb730ff40e90
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2248708
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Tested-by: Michael Mortensen <mmortensen@google.com>

lib/locking.py

diff --git a/lib/locking.py b/lib/locking.py
index 15b4934..4283943 100644
--- a/lib/locking.py
+++ b/lib/locking.py
@@ -91,7 +91,7 @@
       elif e.errno != errno.EAGAIN:
         raise
     if self.description:
-      message = '%s: blocking while %s' % (self.description, message)
+      message = '%s: blocking (LOCK_NB) while %s' % (self.description, message)
     if not self.blocking:
       self.close()
       raise LockNotAcquiredError(message)
@@ -102,9 +102,12 @@
       self.locking_mechanism(self.fd, flags)
     except EnvironmentError as e:
       if e.errno != errno.EDEADLK:
+        message = ('%s: blocking wait failed errno %s'
+                   % (self.description, e))
         raise
       self.unlock()
       self.locking_mechanism(self.fd, flags)
+    logging.info('%s: lock has been acquired, continuing.', self.description)
 
   def lock(self, shared=False):
     """Take a lock of type |shared|.