10467: Merge branch 'master' into 10467-client-disconnect

[arvados.git] / services / keepstore / s3_volume.go

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 33919a37e1371fa322503b3aed3add9f15bf2cf5..17923f807dc8a8f11bc77ce8dc0732001a4a8ba8 100644 (file)
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -22,6 +22,11 @@ import (
        "github.com/AdRoll/goamz/s3"
 )
 
+const (
+       s3DefaultReadTimeout    = arvados.Duration(10 * time.Minute)
+       s3DefaultConnectTimeout = arvados.Duration(time.Minute)
+)
+
 var (
        // ErrS3TrashDisabled is returned by Trash if that operation
        // is impossible with the current config.
@@ -216,10 +221,10 @@ func (v *S3Volume) Start() error {
        // Zero timeouts mean "wait forever", which is a bad
        // default. Default to long timeouts instead.
        if v.ConnectTimeout == 0 {
-               v.ConnectTimeout = arvados.Duration(time.Minute)
+               v.ConnectTimeout = s3DefaultConnectTimeout
        }
        if v.ReadTimeout == 0 {
-               v.ReadTimeout = arvados.Duration(10 * time.Minute)
+               v.ReadTimeout = s3DefaultReadTimeout
        }
 
        client := s3.New(auth, region)