[ARVADOS] updated: 1.1.4-385-g8340155

Git user git at public.curoverse.com
Mon Jun 11 15:28:29 EDT 2018


Summary of changes:
 doc/install/install-keepstore.html.textile.liquid | 5 ++++-
 services/keepstore/config.go                      | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  8340155e016f8267f7f0715429e073b635f45e89 (commit)
      from  d9a0319fec2249a46be5c7386b5ce35ff11cf842 (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 8340155e016f8267f7f0715429e073b635f45e89
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jun 11 15:27:55 2018 -0400

    13579: Document ManagementToken.  Add information about trash behavior.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/doc/install/install-keepstore.html.textile.liquid b/doc/install/install-keepstore.html.textile.liquid
index d1633f3..61553f7 100644
--- a/doc/install/install-keepstore.html.textile.liquid
+++ b/doc/install/install-keepstore.html.textile.liquid
@@ -85,6 +85,9 @@ Listen: :25107
 
 # Format of request/response and error logs: "json" or "text".
 LogFormat: json
+
+# The secret key that must be provided by monitoring services
+# wishing to access the health check endpoint (/_health).
 ManagementToken: ""
 
 # Maximum RAM to use for data buffers, given in multiples of block
@@ -158,7 +161,7 @@ On its own, a keepstore server never deletes data.  The "keep-balance":install-k
 
 When a block is newly written, it is protected from deletion for the duration in @BlobSignatureTTL at .  During this time, it cannot be trashed.
 
-If keep-balance instructs keepstore to trash a block which is older than @BlobSignatureTTL@, and @EnableDelete@ is true, the block will be moved to "trash".
+If keep-balance instructs keepstore to trash a block which is older than @BlobSignatureTTL@, and @EnableDelete@ is true, the block will be moved to "trash".  A block which is in the trash has been moved out of the way and is no longer accessible by read requests, but has not yet been permanently deleted.  Blocks which are in the trash may be recovered using the "untrash" API endpoint.  Blocks are permanently deleted after they have been in the trash for the duration in @TrashLifetime at .
 
 h3. Configure storage volumes
 
diff --git a/services/keepstore/config.go b/services/keepstore/config.go
index fca61ef..ddd4214 100644
--- a/services/keepstore/config.go
+++ b/services/keepstore/config.go
@@ -110,7 +110,8 @@ directory of a mount point at startup time.`
 	systemAuthToken string
 	debugLogf       func(string, ...interface{})
 
-	ManagementToken string
+	ManagementToken string `doc: The secret key that must be provided by monitoring services
+wishing to access the health check endpoint (/_health).`
 
 	metrics
 }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list