Merge ~ubuntu-release/autopkgtest/+git/development:flock-less into ~ubuntu-release/autopkgtest/+git/development:master

[Brian Murray]

The creation of instances for running autopkgtests was taking an extraordinarily long period of time because we had up to 70 processes waiting for the lock file to be released. This reduces the period of time which we wait and creates per architecture lock files.

[Steve Langasek (vorlon)]

review: Needs Fixing

6f895f3... by Brian Murray on 2023-01-13

Complete the change

348186f... by Brian Murray on 2023-01-13

Add a comment as to why we do this

[Paride Legovini (paride)]

As discussed in standup a nicer command would be:

  openstack image show "$imageuuid" -c properties -f json | jq --raw-output .properties.architecture

but we don't have jq installed. We should probably add it to the charm: it's a useful tool and adding it would be a simple exercise on changing the charm dependencies.

In any case this is good to land, so approving.

review: Approve

[Paride Legovini (paride)]

(Not merging in case you want to add the jq command as a comment.)

1c14d44... by Brian Murray on 2023-01-16

Add jq parsing for when we have it installed

[Brian Murray (brian-murray)]

Merged but with a squash so manually marking this as merged.

diff --git a/ssh-setup/nova b/ssh-setup/nova
index b828b1c..ba7cc65 100755
--- a/ssh-setup/nova
+++ b/ssh-setup/nova
@@ -227,8 +227,12 @@ EOF
     imageuuid=$(echo "$last" | cut -f1)
     image=$(echo "$last" | cut -f2)
 
-    echo "Waiting..." >&2
-    flock -x /home/ubuntu/$OS_REGION_NAME.boot.lock sleep 30
+    # Canonical IS requested that we limit boot rate as otherwise resource
+    # utlization in the cloud does not get reported properly and instances
+    # failed to boot.
+    # ARCH=$(openstack image show $imageuuid -c properties -f json | jq --raw-output .properties.architecture)
+    ARCH=$(openstack image show $imageuuid -c properties -f json | grep architecture | cut -d'"' -f4)
+    flock --verbose -x /home/ubuntu/$OS_REGION_NAME-$ARCH.boot.lock sleep 15
 
     # Boot a nova instance and returns its connection parameters
     [ -n "$SRVNAME" ] || SRVNAME=`mktemp -u autopkgtest-nova-XXXXXX`