[ARVADOS] updated: 2.1.0-1107-g284a9a551

Git user git at public.arvados.org
Thu Jul 29 13:48:33 UTC 2021


Summary of changes:
 services/keep-balance/collection.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  284a9a5515af712aff787ecc141d45c888fcef66 (commit)
      from  b35e98fcf41753bf7d04ee21340b09618580509e (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 284a9a5515af712aff787ecc141d45c888fcef66
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 28 23:45:23 2021 -0400

    17574: Fix misleading errors after reaching update limit.
    
    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 575aa0c39..1da3ec441 100644
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@ -163,7 +163,7 @@ func (bal *Balancer) updateCollections(ctx context.Context, c *arvados.Client, c
 			txPending := 0
 			flush := func(final bool) error {
 				err := tx.Commit()
-				if err != nil {
+				if err != nil && ctx.Err() == nil {
 					tx.Rollback()
 					return err
 				}
@@ -221,7 +221,7 @@ func (bal *Balancer) updateCollections(ctx context.Context, c *arvados.Client, c
 					where uuid=$4`,
 					repl, thresholdStr, classes, coll.UUID)
 				if err != nil {
-					if err != context.Canceled {
+					if ctx.Err() == nil {
 						bal.logf("%s: update failed: %s", coll.UUID, err)
 					}
 					continue

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list