[ARVADOS] updated: 3616a53916b7e9302bb232f64263cfe140b03fc7

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/handlers.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  3616a53916b7e9302bb232f64263cfe140b03fc7 (commit)
      from  1080ec939aa8739d53384f70bf872fc42fdbd370 (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 3616a53916b7e9302bb232f64263cfe140b03fc7
Author: Tim Pierce <twp at curoverse.com>
Date:   Thu Aug 21 16:43:46 2014 -0400

    3448: add error checking
    
    Code review comments in https://arvados.org/issues/3448#note-9
    
    * volume.Touch() must fail if the file cannot be locked
    * if volume.Touch() fails, continue looking for other volumes that can
      fulfill the request.
    
    Refs #3448.

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 026464c..039b2ac 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -460,8 +460,12 @@ func GetBlock(hash string, update_timestamp bool) ([]byte, error) {
 						vol, hash)
 				}
 				// Update the timestamp if the caller requested.
+				// If we could not update the timestamp, continue looking on
+				// other volumes.
 				if update_timestamp {
-					vol.Touch(hash)
+					if vol.Touch(hash) != nil {
+						continue
+					}
 				}
 				return buf, nil
 			}

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


hooks/post-receive
--