Reorder lock_volumes and dlock in SD to avoid race conditions

[bacula/bacula] / bacula / scripts / devel_bacula.in

diff --git a/bacula/scripts/devel_bacula.in b/bacula/scripts/devel_bacula.in
index bddb7705eeb7525130651ce6ba3776d062fb4064..4a68501db282d2e69e4b27ba7c3290ba46241006 100755 (executable)
--- a/bacula/scripts/devel_bacula.in
+++ b/bacula/scripts/devel_bacula.in
@@ -230,8 +230,11 @@ case "$1" in
             OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
          fi
 
-#        valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/dird.conf
-         ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/dird.conf
+         if [ "${VALGRIND}" != '' ]; then
+            valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/dird.conf
+         else
+            ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/dird.conf
+         fi
        }
        ;;