[ARVADOS] updated: 2.1.0-1106-gb35e98fcf

[Git user]

Summary of changes:
 doc/admin/upgrading.html.textile.liquid              | 4 ++++
 doc/install/install-keep-balance.html.textile.liquid | 4 ++--
 services/keep-balance/collection.go                  | 4 ++--
 services/keep-balance/integration_test.go            | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

       via  b35e98fcf41753bf7d04ee21340b09618580509e (commit)
       via  0ca9b2d72645e10276fe56347c63867f166419e4 (commit)
       via  be3d26fbfd0caf5ff881977d76597aacb11a3476 (commit)
      from  1657c7fbb89e790655f830630f60c68ceaf8569f (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 b35e98fcf41753bf7d04ee21340b09618580509e
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 28 18:23:05 2021 -0400

    17574: Update test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index 1458fe452..3ddcb159d 100644
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -119,7 +119,7 @@ func (s *integrationSuite) TestBalanceAPIFixtures(c *check.C) {
 		classes []string
 	}{
 		{arvadostest.EmptyCollectionUUID, 0, []string{"default"}},
-		{arvadostest.FooCollection, 4, []string{"default"}},                                // "foo" blk
+		{arvadostest.FooCollection, 2, []string{"default"}},                                // "foo" blk
 		{arvadostest.StorageClassesDesiredDefaultConfirmedDefault, 2, []string{"default"}}, // "bar" blk
 		{arvadostest.StorageClassesDesiredArchiveConfirmedDefault, 0, []string{"archive"}}, // "bar" blk
 	} {

commit 0ca9b2d72645e10276fe56347c63867f166419e4
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 28 18:22:08 2021 -0400

    17574: Fix wait on empty channel.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-balance/collection.go b/services/keep-balance/collection.go
index daedeb8bf..575aa0c39 100644
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@ -239,8 +239,8 @@ func (bal *Balancer) updateCollections(ctx context.Context, c *arvados.Client, c
 	}
 	wg.Wait()
 	bal.logf("updated %d collections", updated)
-	if err := <-errs; err != nil {
-		return fmt.Errorf("error updating collections: %s", err)
+	if len(errs) > 0 {
+		return fmt.Errorf("error updating collections: %s", <-errs)
 	}
 	return nil
 }

commit be3d26fbfd0caf5ff881977d76597aacb11a3476
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 28 16:20:33 2021 -0400

    17574: Update install/upgrade docs wrt PostgreSQL access.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 3c283c354..dfb6a0ad6 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -39,6 +39,10 @@ h2(#main). development main (as of 2021-07-15)
 
 "Upgrading from 2.2.0":#v2_2_0
 
+h3. keep-balance requires access to PostgreSQL
+
+Make sure the keep-balance process can connect to your PostgreSQL server using the settings in your config file. (In previous versions, keep-balance accessed the database through controller instead of connecting to the database server directly.)
+
 h3. crunch-dispatch-local now requires config.yml
 
 The @crunch-dispatch-local@ dispatcher now reads the API host and token from the system wide @/etc/arvados/config.yml@ .  It will fail to start that file is not found or not readable.
diff --git a/doc/install/install-keep-balance.html.textile.liquid b/doc/install/install-keep-balance.html.textile.liquid
index 1d9b654b2..bb4ae7b3d 100644
--- a/doc/install/install-keep-balance.html.textile.liquid
+++ b/doc/install/install-keep-balance.html.textile.liquid
@@ -18,13 +18,13 @@ h2(#introduction). Introduction
 
 Keep-balance deletes unreferenced and overreplicated blocks from Keep servers, makes additional copies of underreplicated blocks, and moves blocks into optimal locations as needed (e.g., after adding new servers). See "Balancing Keep servers":{{site.baseurl}}/admin/keep-balance.html for usage details.
 
-Keep-balance can be installed anywhere with network access to Keep services. Typically it runs on the same host as keepproxy.
+Keep-balance can be installed anywhere with network access to Keep services, arvados-controller, and PostgreSQL. Typically it runs on the same host as keepproxy.
 
 *A cluster should have only one instance of keep-balance running at a time.*
 
 {% include 'notebox_begin' %}
 
-If you are installing keep-balance on an existing system with valuable data, you can run keep-balance in "dry run" mode first and review its logs as a precaution. To do this, edit your keep-balance startup script to use the flags @-commit-pulls=false -commit-trash=false at .
+If you are installing keep-balance on an existing system with valuable data, you can run keep-balance in "dry run" mode first and review its logs as a precaution. To do this, edit your keep-balance startup script to use the flags @-commit-pulls=false -commit-trash=false -commit-confirmed-fields=false at .
 
 {% include 'notebox_end' %}
 

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


hooks/post-receive
--