[ARVADOS] updated: 8746e8c12b33f56cabbcab138c6077eb351be533

Git user git at public.curoverse.com
Thu Sep 8 14:35:20 EDT 2016


Summary of changes:

  discards  a43f24b3e65d1aa93621d61f7ccd5fddf762af12 (commit)
       via  8746e8c12b33f56cabbcab138c6077eb351be533 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a43f24b3e65d1aa93621d61f7ccd5fddf762af12)
            \
             N -- N -- N (8746e8c12b33f56cabbcab138c6077eb351be533)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8746e8c12b33f56cabbcab138c6077eb351be533
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Sep 8 14:26:58 2016 -0400

    9986: Kill test suite when danger of deadlock is detected.

diff --git a/services/fuse/tests/integration_test.py b/services/fuse/tests/integration_test.py
index 5b11d23..fba4560 100644
--- a/services/fuse/tests/integration_test.py
+++ b/services/fuse/tests/integration_test.py
@@ -72,7 +72,12 @@ class IntegrationTest(unittest.TestCase):
                         arvados_fuse.command.ArgumentParser().parse_args(
                             argv + ['--foreground',
                                     '--unmount-timeout=0.1',
-                                    self.mnt])):
+                                    self.mnt])) as m:
                     return func(self, *args, **kwargs)
+                if m.llfuse_thread.is_alive():
+                    self.logger.warning("IntegrationTest.mount:"
+                                        " llfuse thread still alive after umount"
+                                        " -- killing test suite to avoid deadlock")
+                    os.kill(os.getpid(), signal.SIGKILL)
             return wrapper
         return decorator

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list