update sources to v12.1.3

[ceph.git] / ceph / qa / workunits / rbd / test_admin_socket.sh

diff --git a/ceph/qa/workunits/rbd/test_admin_socket.sh b/ceph/qa/workunits/rbd/test_admin_socket.sh
index 9135c2ecefcf19c4374453fb4e17693ea441a443..a7ecd839c5dc5e45f4e3844069362b68e4679534 100755 (executable)
--- a/ceph/qa/workunits/rbd/test_admin_socket.sh
+++ b/ceph/qa/workunits/rbd/test_admin_socket.sh
@@ -62,15 +62,17 @@ function rbd_check_perfcounter()
 function rbd_watch_start()
 {
     local image=$1
+    local asok=$(rbd_watch_asok ${image})
 
     mkfifo $(rbd_watch_fifo ${image})
     (cat $(rbd_watch_fifo ${image}) |
-           rbd watch ${image} > $(rbd_watch_out_file ${image}) 2>&1)&
+           rbd --admin-socket ${asok} watch ${image} \
+                > $(rbd_watch_out_file ${image}) 2>&1)&
 
     # find pid of the started rbd watch process
     local pid
     for i in `seq 10`; do
-       pid=$(ps auxww | awk "/[r]bd watch ${image}/ {print \$2}")
+       pid=$(ps auxww | awk "/[r]bd --admin.* watch ${image}/ {print \$2}")
        test -n "${pid}" && break
        sleep 0.1
     done
@@ -78,14 +80,12 @@ function rbd_watch_start()
     echo ${pid} > $(rbd_watch_pid_file ${image})
 
     # find watcher admin socket
-    local asok=$(ceph-conf admin_socket | sed -E "s/[0-9]+/${pid}/")
     test -n "${asok}"
     for i in `seq 10`; do
        test -S "${asok}" && break
        sleep 0.1
     done
     test -S "${asok}"
-    ln -s "${asok}" $(rbd_watch_asok ${image})
 
     # configure debug level
     ceph --admin-daemon "${asok}" config set debug_rbd 20