[arvados] updated: 2.6.0-454-g810f82cb3

[git repository hosting]

Summary of changes:
 tools/salt-install/installer.sh | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

       via  810f82cb348d83fd09492384a9b31b31a5e3c9e9 (commit)
      from  2c583f85220cd6d4e2aabb0ad2753cac6f9065a6 (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 810f82cb348d83fd09492384a9b31b31a5e3c9e9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Aug 8 13:42:25 2023 -0400

    20680: Only do a rolling update when there is multiple controllers
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 3c9df7c5d..fe0404743 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -313,12 +313,16 @@ case "$subcmd" in
 		fi
 	    done
 
-	    if [[ ${ENABLE_BALANCER} == yes ]] ;
+	    BALANCER=${ROLE2NODES['balancer']:-}
+
+	    # Check if there are multiple controllers, they'll be comma-separated
+	    # in ROLE2NODES
+	    if [[ ${ROLE2NODES['controller']} =~ , ]] ;
 	    then
-		# We have a load balancer, so do a rolling update,
-		# take down each node at the load balancer before
-		# updating it.
-		BALANCER=${ROLE2NODES['balancer']}
+		# If we have multiple controllers then there must be
+		# load balancer. We want to do a rolling update, take
+		# down each node at the load balancer before updating
+		# it.
 
 		for NODE in "${!NODES[@]}"
 		do
@@ -333,18 +337,21 @@ case "$subcmd" in
 			unset NODES[$NODE]
 		    fi
 		done
-
-		# Now make sure all nodes are enabled.
-		export DISABLED_CONTROLLER=""
-		deploynode $BALANCER "${NODES[$BALANCER]}" $BRANCH
-		unset NODES[$BALANCER]
 	    else
-		# No balancer, should only be one controller
+		# Only one controller
 		NODE=${ROLE2NODES['controller']}
 		deploynode $NODE "${NODES[$NODE]}" $BRANCH
 		unset NODES[$NODE]
 	    fi
 
+	    if [[ -n "$BALANCER" ]] ; then
+		# Deploy balancer. In the rolling update case, this
+		# will re-enable all the controllers at the balancer.
+		export DISABLED_CONTROLLER=""
+		deploynode $BALANCER "${NODES[$BALANCER]}" $BRANCH
+		unset NODES[$BALANCER]
+	    fi
+
 	    for NODE in "${!NODES[@]}"
 	    do
 		# Everything else (we removed the nodes that we

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


hooks/post-receive
--