Merge branch 'master' into 15106-trgm-text-search

[arvados.git] / services / keep-balance / usage.go

diff --git a/services/keep-balance/usage.go b/services/keep-balance/usage.go
index 0f4effe6f4e9b7c4e2590cfeb48ef5cd729ec5cd..b39e83905d617f58b605c22c7e1a43cc8aa4c8cb 100644 (file)
--- a/services/keep-balance/usage.go
+++ b/services/keep-balance/usage.go
@@ -17,9 +17,12 @@ Client:
     Insecure: false
 KeepServiceTypes:
     - disk
     Insecure: false
 KeepServiceTypes:
     - disk

+Listen: ":9005"
+ManagementToken: xyzzy

 RunPeriod: 600s
 CollectionBatchSize: 100000
 RunPeriod: 600s
 CollectionBatchSize: 100000

-CollectionBuffers: 1000`)
+CollectionBuffers: 1000
+RequestTimeout: 30m`)

 
 func usage() {
        fmt.Fprintf(os.Stderr, `
 
 func usage() {
        fmt.Fprintf(os.Stderr, `


@@ -86,6 +89,11 @@ Tuning resource usage:
     while the current page is still being processed. If this is zero
     or omitted, pages are processed serially.
 
     while the current page is still being processed. If this is zero
     or omitted, pages are processed serially.
 

+    RequestTimeout is the maximum time keep-balance will spend on a
+    single HTTP request (getting a page of collections, getting the
+    block index from a keepstore server, or sending a trash or pull
+    list to a keepstore server). Defaults to 30 minutes.
+

 Limitations:
 
     keep-balance does not attempt to discover whether committed pull
 Limitations:
 
     keep-balance does not attempt to discover whether committed pull