[ARVADOS] updated: 1.1.0-49-gec0c244

Git user git at public.curoverse.com
Tue Oct 17 11:10:33 EDT 2017


Summary of changes:
 build/libcloud-pin.sh                              |   2 +-
 build/run-build-packages.sh                        |   2 +
 build/run-tests.sh                                 |   2 +
 sdk/go/arvados/config.go                           | 105 ++++++++++
 sdk/go/auth/auth.go                                |   2 +-
 sdk/go/health/aggregator.go                        | 218 +++++++++++++++++++++
 sdk/go/health/aggregator_test.go                   | 192 ++++++++++++++++++
 sdk/go/keepclient/block_cache.go                   |  24 ++-
 sdk/go/keepclient/collectionreader_test.go         |   1 +
 sdk/go/keepclient/keepclient.go                    |   8 +
 sdk/go/keepclient/keepclient_test.go               |   4 +-
 services/crunch-run/crunchrun.go                   |  28 ++-
 services/crunch-run/crunchrun_test.go              |   9 +
 services/health/main.go                            |  55 ++++++
 services/keep-web/cache.go                         |   8 +-
 services/keep-web/main.go                          |   1 +
 services/keepstore/s3_volume.go                    |  28 +--
 .../arvnodeman/computenode/driver/azure.py         |   2 +-
 services/nodemanager/setup.py                      |   4 +-
 .../tests/test_computenode_driver_azure.py         |   2 +-
 20 files changed, 661 insertions(+), 36 deletions(-)
 create mode 100644 sdk/go/arvados/config.go
 create mode 100644 sdk/go/health/aggregator.go
 create mode 100644 sdk/go/health/aggregator_test.go
 create mode 100644 services/health/main.go

       via  ec0c244be178aed7af0cf990a256dda557034b68 (commit)
       via  43e8eaee1c6065d768fdb2291f135eb3256da935 (commit)
       via  e14975a4a482dd4a6c1579fbeee9038d7227b385 (commit)
       via  856fad7ba0db75710c479cb2d2738754d818a883 (commit)
       via  5bc52dbe43040297c622900797c55e686b377e9b (commit)
       via  15b5b59f5902fdc0fe4eb5366ba3b654b117d7df (commit)
       via  d0414ca727006b821b10b25d3920dc0f66400356 (commit)
       via  60e0be49f6fa0e24349635621acb4f7d273064d9 (commit)
       via  ff100fbf824e2dbc2ff0afd3d746ac562532cfb6 (commit)
       via  237adbd91e2dc0d15f79390f7e38f70d55372877 (commit)
       via  02adf6134d262d17066dbc48d3fb85c8861c8349 (commit)
       via  a8d59274b32098abcc6b36b46ae354de3dcd13ad (commit)
       via  4a09e252ea6dd94e14cdf5ddb324ccf574b42423 (commit)
       via  6ee6e654bc873db10037c735a63697d295ec40cb (commit)
       via  91c8ec8048ac1c99d47c32c20693b06b8d307446 (commit)
       via  7bd24df9e61784c738668b1b2bab73c198b3c782 (commit)
       via  10487342564c21497c598d74e3988f4ca0e1434f (commit)
       via  a3851eec63fb52c1f8121395d0092f4aff25405f (commit)
       via  3bdff577515638d273c1df5ba9d702cdf3d5abbd (commit)
       via  94dd3166ce6120a49049597493771d33fc089bfd (commit)
       via  9fdfd5c5b229ea42193710f891e953b452bd90e7 (commit)
       via  a9497f8d2756104ba07d88d5c8c7b84790fd83f3 (commit)
       via  9959bf0f5631daa84e8afa7de145154390259c67 (commit)
       via  f0e6212bbe6e34f6ac4e928a236e77cca852895d (commit)
       via  825e37afbde9b1f0cb43451170fc300f64943ada (commit)
       via  63218507eec156df91f80c86ee05d680d67b8336 (commit)
       via  91db2d8fd32bc3f6c2a26ffc37f6591b1e5f380b (commit)
      from  337de2e3dfeacc5054cb644513be61f5d35585ae (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 ec0c244be178aed7af0cf990a256dda557034b68
Merge: 43e8eae e14975a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 17 11:08:27 2017 -0400

    12216: Merge branch 'master' into 12216-webdav-list
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 43e8eaee1c6065d768fdb2291f135eb3256da935
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 17 11:06:16 2017 -0400

    12216: Separate config for uuid->pdh cache TTL, default 5 seconds.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index c29ae7d..ce1168a 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -16,6 +16,7 @@ import (
 
 type cache struct {
 	TTL                  arvados.Duration
+	UUIDTTL              arvados.Duration
 	MaxCollectionEntries int
 	MaxCollectionBytes   int64
 	MaxPermissionEntries int
@@ -135,13 +136,12 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 			return nil, err
 		}
 		if current.PortableDataHash == pdh {
-			exp := time.Now().Add(time.Duration(c.TTL))
 			c.permissions.Add(permKey, &cachedPermission{
-				expire: exp,
+				expire: time.Now().Add(time.Duration(c.TTL)),
 			})
 			if pdh != targetID {
 				c.pdhs.Add(targetID, &cachedPDH{
-					expire: exp,
+					expire: time.Now().Add(time.Duration(c.UUIDTTL)),
 					pdh:    pdh,
 				})
 			}
@@ -167,7 +167,7 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 		expire: exp,
 	})
 	c.pdhs.Add(targetID, &cachedPDH{
-		expire: exp,
+		expire: time.Now().Add(time.Duration(c.UUIDTTL)),
 		pdh:    collection.PortableDataHash,
 	})
 	c.collections.Add(arv.ApiToken+"\000"+collection.PortableDataHash, &cachedCollection{
diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 585dab1..27ceb48 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -45,6 +45,7 @@ func DefaultConfig() *Config {
 		Listen: ":80",
 		Cache: cache{
 			TTL:                  arvados.Duration(5 * time.Minute),
+			UUIDTTL:              arvados.Duration(5 * time.Second),
 			MaxCollectionEntries: 1000,
 			MaxCollectionBytes:   100000000,
 			MaxPermissionEntries: 1000,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list