[ARVADOS] updated: 2.1.0-2395-gf959aac33

[Git user]

Summary of changes:
 tools/salt-install/provision.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  f959aac33c7f09df2975a81b8a1cd1eeeb38af6f (commit)
      from  0b4945244d55214b331adabce38e33800b55b3e1 (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 f959aac33c7f09df2975a81b8a1cd1eeeb38af6f
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Apr 28 11:15:44 2022 -0400

    Add a 2 minute lock timeout to the first invocation of apt. This is
    supported from apt 1.9.1 (i.e Debian 11, ubuntu 20.04 and up). It avoids
    race conditions, e.g. caused by cloud-init running apt on a node that
    has just booted.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index c9e535fad..be1506c62 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -302,7 +302,10 @@ else
       yum install -y  curl git jq
       ;;
     "debian"|"ubuntu")
-      DEBIAN_FRONTEND=noninteractive apt update
+      # Wait 2 minutes for any apt locks to clear
+      # This option is supported from apt 1.9.1 and ignored in older apt versions.
+      # Cf. https://blog.sinjakli.co.uk/2021/10/25/waiting-for-apt-locks-without-the-hacky-bash-scripts/
+      DEBIAN_FRONTEND=noninteractive apt -o DPkg::Lock::Timeout=120 update
       DEBIAN_FRONTEND=noninteractive apt install -y curl git jq
       ;;
   esac

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


hooks/post-receive
--