[arvados] updated: 2.7.0-5382-g9dc967877c

git repository hosting git at public.arvados.org
Mon Nov 20 19:05:03 UTC 2023


Summary of changes:
 cmd/arvados-client/cmd_test.go                    |  5 ++-
 cmd/arvados-server/arvados-controller.service     |  1 +
 cmd/arvados-server/arvados-dispatch-cloud.service |  1 +
 cmd/arvados-server/arvados-dispatch-lsf.service   |  1 +
 cmd/arvados-server/arvados-git-httpd.service      |  1 +
 cmd/arvados-server/arvados-health.service         |  1 +
 cmd/arvados-server/arvados-ws.service             |  1 +
 cmd/arvados-server/crunch-dispatch-slurm.service  |  1 +
 cmd/arvados-server/keep-balance.service           |  3 +-
 cmd/arvados-server/keep-web.service               |  1 +
 cmd/arvados-server/keepproxy.service              |  1 +
 cmd/arvados-server/keepstore.service              |  1 +
 lib/cli/get.go                                    |  4 +-
 lib/cmd/cmd.go                                    |  6 ++-
 lib/cmd/parseflags.go                             |  4 +-
 lib/config/cmd_test.go                            |  2 +-
 lib/config/config.default.yml                     |  9 +++++
 lib/config/export.go                              |  2 +
 sdk/go/arvados/config.go                          |  2 +
 services/keep-balance/balance.go                  | 47 ++++++++++++++---------
 services/keep-balance/balance_run_test.go         | 45 ++++++++--------------
 services/keep-balance/balance_test.go             | 12 ++++--
 services/keep-balance/change_set.go               | 25 +++++++++---
 services/keep-balance/integration_test.go         |  3 --
 services/keep-balance/main.go                     | 15 ++++++--
 services/keep-balance/server.go                   |  6 +--
 26 files changed, 121 insertions(+), 79 deletions(-)

       via  9dc967877cb3599ce3584aca57e8c3672f94bd0a (commit)
       via  b6b7a5d8948a3749dabe1a983368065dd21e4599 (commit)
       via  e98eb84cc8f860bfad29b2b79e72603fccad673c (commit)
       via  74c506146023934d0f052e2bd4971d143b41404d (commit)
       via  434508e84040487628d0e3efaa9ef86a85719ea7 (commit)
      from  0e131fba4895c95b4829c3c66da62f5bd1111832 (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 9dc967877cb3599ce3584aca57e8c3672f94bd0a
Merge: 0e131fba48 b6b7a5d894
Author: Tom Clegg <tom at curii.com>
Date:   Mon Nov 20 14:04:26 2023 -0500

    Merge branch '21189-changeset-limit'
    
    refs #21189
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit b6b7a5d8948a3749dabe1a983368065dd21e4599
Author: Tom Clegg <tom at curii.com>
Date:   Mon Nov 20 14:03:43 2023 -0500

    21189: Improve wording in config comments and logs.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 4fe75bd680..844e67bfcc 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -642,8 +642,8 @@ Clusters:
       # block" requests to send to each keepstore server at a
       # time. Smaller values use less memory in keepstore and
       # keep-balance. Larger values allow more progress per
-      # keep-balance iteration. Setting both limits to zero amounts
-      # to a "dry run".
+      # keep-balance iteration. A zero value computes all of the
+      # needed changes but does not apply any.
       BalancePullLimit: 100000
       BalanceTrashLimit: 100000
 
diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index bb7294c4ba..b20144e3af 100644
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -112,7 +112,7 @@ func (srv *Server) runForever(ctx context.Context) error {
 	for {
 		if srv.Cluster.Collections.BalancePullLimit < 1 && srv.Cluster.Collections.BalanceTrashLimit < 1 {
 			logger.Print("WARNING: Will scan periodically, but no changes will be committed.")
-			logger.Print("=======  Consider using non-zero BalancePullLimit and BalanceTrashLimit configs.")
+			logger.Print("=======  To commit changes, set BalancePullLimit and BalanceTrashLimit values greater than zero.")
 		}
 
 		if !dblock.KeepBalanceService.Check() {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list