[ARVADOS] updated: 9c3cc0f61751720cfdea62717934746d1aa32b72

[Git user]

Summary of changes:
 sdk/python/arvados/arvfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  9c3cc0f61751720cfdea62717934746d1aa32b72 (commit)
       via  e41abf0cefe61a69a5dac27647066116eba5af96 (commit)
       via  6361d996c7a2c7d7648abfcf1699aa989e552f22 (commit)
      from  4ed4b6554535849341673efb7f80392dd5fba946 (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 9c3cc0f61751720cfdea62717934746d1aa32b72
Merge: 4ed4b65 e41abf0
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Nov 22 12:14:47 2016 -0500

    Merge branch '9897-log-block-prefetch-worker-exceptions' closes #9897


commit e41abf0cefe61a69a5dac27647066116eba5af96
Author: Colin Nolan <colin.nolan at sanger.ac.uk>
Date:   Tue Nov 22 10:18:18 2016 +0000

    9897: Changes as per discussion in #9897.

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index e00eeae..517d617 100644
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -5,7 +5,6 @@ import bz2
 import config
 import hashlib
 import threading
-import traceback
 import Queue
 import copy
 import errno
@@ -517,7 +516,7 @@ class _BlockManager(object):
                     return
                 self._keep.get(b)
             except Exception:
-                _logger.error(traceback.format_exc())
+                _logger.exception("Exception doing block prefetch")
 
     @synchronized
     def start_get_threads(self):

commit 6361d996c7a2c7d7648abfcf1699aa989e552f22
Author: Colin Nolan <colin.nolan at sanger.ac.uk>
Date:   Tue Nov 15 15:46:51 2016 +0000

    9897: Logs errors encountered by block prefetch workers.

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index 610fd7d..e00eeae 100644
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -5,6 +5,7 @@ import bz2
 import config
 import hashlib
 import threading
+import traceback
 import Queue
 import copy
 import errno
@@ -516,7 +517,7 @@ class _BlockManager(object):
                     return
                 self._keep.get(b)
             except Exception:
-                pass
+                _logger.error(traceback.format_exc())
 
     @synchronized
     def start_get_threads(self):

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


hooks/post-receive
--