[ARVADOS] updated: 1.1.3-80-g1632cb9

[Git user]

Summary of changes:
 sdk/python/arvados/keep.py           | 180 ++++++++++++++++++-----------------
 sdk/python/tests/test_keep_client.py |  28 +++++-
 2 files changed, 119 insertions(+), 89 deletions(-)

       via  1632cb9ffffc882987c69d2e5f8b91f849fa9d8c (commit)
       via  da5b20e29680ad6a172ee7875001a1a9c348b674 (commit)
       via  86183e3763202c53eb547a5432d291be9ed2986c (commit)
       via  8404fc27cc5904f90ef429a2a6e2fd43d5d49996 (commit)
      from  d9c9b4b6f8fc895d3c91d3b49380d6397576a10c (commit)

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 1632cb9ffffc882987c69d2e5f8b91f849fa9d8c
Merge: d9c9b4b da5b20e
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Feb 21 12:06:04 2018 -0500

    Merge branch '13106-keepclient-slot' closes #13106
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit da5b20e29680ad6a172ee7875001a1a9c348b674
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Feb 21 12:05:36 2018 -0500

    13106: Add note about the test.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index a8b2f15..872c93b 100644
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -1261,6 +1261,15 @@ class KeepClientAPIErrorTest(unittest.TestCase):
                     raise arvados.errors.KeepReadError()
         keep_client = arvados.KeepClient(api_client=ApiMock(),
                                              proxy='', local_store='')
+
+        # The bug this is testing for is that if an API (not
+        # keepstore) exception is thrown as part of a get(), the next
+        # attempt to get that same block will result in a deadlock.
+        # This is why there are two get()s in a row.  Unfortunately,
+        # the failure mode for this test is that the test suite
+        # deadlocks, there isn't a good way to avoid that without
+        # adding a special case that has no use except for this test.
+
         with self.assertRaises(arvados.errors.KeepReadError):
             keep_client.get("acbd18db4cc2f85cedef654fccc4a4d8+3")
         with self.assertRaises(arvados.errors.KeepReadError):

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


hooks/post-receive
--