From: Samuel Just <sjust@redhat.com>
Date: Thu, 5 May 2022 18:44:46 +0000 (-0700)
Subject: vstart: default CEPH_ASOK_DIR to asok/
X-Git-Tag: v18.0.0~880^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba1594092fba583a0e30b0a477eea707016bcddd;p=ceph.git

vstart: default CEPH_ASOK_DIR to asok/

stop.sh removes the configured asok_dir, so defaulting this to out/
results in logs being removed.  Let's instead just create an
asok/ directory.

Fixes: https://tracker.ceph.com/issues/55563
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 0334492e3e49..5f43bba2b14a 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -42,7 +42,7 @@ if [ -n "$VSTART_DEST" ]; then
     CEPH_CONF_PATH=$VSTART_DEST
     CEPH_DEV_DIR=$VSTART_DEST/dev
     CEPH_OUT_DIR=$VSTART_DEST/out
-    CEPH_ASOK_DIR=$VSTART_DEST/out
+    CEPH_ASOK_DIR=$VSTART_DEST/asok
 fi
 
 get_cmake_variable() {
@@ -128,7 +128,7 @@ fi
 [ -z "$CEPH_DIR" ] && CEPH_DIR="$PWD"
 [ -z "$CEPH_DEV_DIR" ] && CEPH_DEV_DIR="$CEPH_DIR/dev"
 [ -z "$CEPH_OUT_DIR" ] && CEPH_OUT_DIR="$CEPH_DIR/out"
-[ -z "$CEPH_ASOK_DIR" ] && CEPH_ASOK_DIR="$CEPH_DIR/out"
+[ -z "$CEPH_ASOK_DIR" ] && CEPH_ASOK_DIR="$CEPH_DIR/asok"
 [ -z "$CEPH_RGW_PORT" ] && CEPH_RGW_PORT=8000
 [ -z "$CEPH_CONF_PATH" ] && CEPH_CONF_PATH=$CEPH_DIR