[ARVADOS] created: 3071c697bae9e07e59dcd7a70378fc3af8fd9517

[git at public.curoverse.com]

        at  3071c697bae9e07e59dcd7a70378fc3af8fd9517 (commit)


commit 3071c697bae9e07e59dcd7a70378fc3af8fd9517
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 22 17:12:28 2015 -0400

    7225: Re-raise unexpected exceptions in commit_bufferblock.

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index 106f7a7..f0be3ba 100644
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -564,10 +564,13 @@ class _BlockManager(object):
             # Mark the block as PENDING so to disallow any more appends.
             block.set_state(_BufferBlock.PENDING)
         except StateChangeError as e:
-            if e.state == _BufferBlock.PENDING and sync:
-                block.wait_for_commit.wait()
-                if block.state() == _BufferBlock.ERROR:
-                    raise block.error
+            if e.state == _BufferBlock.PENDING:
+                if sync:
+                    block.wait_for_commit.wait()
+                    if block.state() == _BufferBlock.ERROR:
+                        raise block.error
+            else:
+                raise
             return
 
         if sync:

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


hooks/post-receive
--