From: Ward Vandewege <ward@curii.com>
Date: Thu, 8 Oct 2020 03:40:42 +0000 (-0400)
Subject: When doing arvbox hotreset, make sure to use flock around the rake task.
X-Git-Tag: 2.1.0~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5d91989697c9954f346ce77b95a8a83f54ee6957

When doing arvbox hotreset, make sure to use flock around the rake task.

refs #16955

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 1c11a073f5..a180b43630 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -622,7 +622,7 @@ sv stop keepproxy
 cd /usr/src/arvados/services/api
 export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
 export RAILS_ENV=development
-bundle exec rake db:drop
+flock $GEM_HOME/gems.lock bundle exec rake db:drop
 rm $ARVADOS_CONTAINER_PATH/api_database_setup
 rm $ARVADOS_CONTAINER_PATH/superuser_token
 sv start api