8567: Improve disk space accounting. Default to use overlay storage driver (but...

[arvados.git] / docker / migrate-docker19 / migrate.sh

diff --git a/docker/migrate-docker19/migrate.sh b/docker/migrate-docker19/migrate.sh
index 8e39be45678aa357632dd7e4dd0bb147bcdeebc3..350ae4ce562e5626cfbedfad59603fd12547c511 100755 (executable)
--- a/docker/migrate-docker19/migrate.sh
+++ b/docker/migrate-docker19/migrate.sh
@@ -2,8 +2,19 @@
 
 set -e
 
+image_tar_keepref=$1
+image_id=$2
+image_repo=$3
+image_tag=$4
+project_uuid=$5
+graph_driver=$6
+
+function freespace() {
+    df -B1 /var/lib/docker | tail -n1 | sed 's/  */ /g' | cut -d' ' -f4
+}
+
 function start_docker {
-    /root/dnd.sh &
+    /root/dnd.sh $graph_driver &
     for i in $(seq 1 10) ; do
         if docker version >/dev/null 2>/dev/null ; then
             return
@@ -27,20 +38,18 @@ function kill_docker {
 }
 
 function cleanup {
+    trap EXIT
     kill_docker
     rm -rf /var/lib/docker/*
     rm -rf /root/.cache/arvados/docker/*
+    echo "Available space after cleanup is $(freespace)"
 }
 
 trap cleanup EXIT
 
 start_docker
 
-image_tar_keepref=$1
-image_id=$2
-image_repo=$3
-image_tag=$4
-project_uuid=$5
+echo "Initial available space is $(freespace)"
 
 arv-get $image_tar_keepref | docker load
 
@@ -50,13 +59,19 @@ docker images -a
 
 kill_docker
 
+echo "Available space after image load is $(freespace)"
+
 cd /root/pkgs
 dpkg -i libltdl7_2.4.2-1.11+b1_amd64.deb docker-engine_1.13.1-0~debian-jessie_amd64.deb
 
+echo "Available space after image upgrade is $(freespace)"
+
 start_docker
 
 docker images -a
 
 UUID=$(arv-keepdocker --force-image-format --project-uuid=$project_uuid $image_repo $image_tag)
 
+echo "Available space after arv-keepdocker is $(freespace)"
+
 echo "Migrated uuid is $UUID"