update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / qa / standalone / mon / osd-pool-create.sh

diff --git a/ceph/qa/standalone/mon/osd-pool-create.sh b/ceph/qa/standalone/mon/osd-pool-create.sh
index 5b19c0095ef3d2fead735c837c65adcc9a64e7b9..992cbf583aaf57c7df1d831c86a6c930db5f4ca5 100755 (executable)
--- a/ceph/qa/standalone/mon/osd-pool-create.sh
+++ b/ceph/qa/standalone/mon/osd-pool-create.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (C) 2013, 2014 Cloudwatt <libre.licensing@cloudwatt.com>
 # Copyright (C) 2014, 2015 Red Hat <contact@redhat.com>
@@ -213,13 +213,17 @@ function TEST_pool_create_rep_expected_num_objects() {
     setup $dir || return 1
 
     # disable pg dir merge
+    CEPH_ARGS+="--osd-objectstore=filestore"
     export CEPH_ARGS
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
 
     ceph osd pool create rep_expected_num_objects 64 64 replicated  replicated_rule 100000 || return 1
     # wait for pg dir creating
-    sleep 5
+    sleep 30
+    ceph pg ls
+    find ${dir}/0/current -ls
     ret=$(find ${dir}/0/current/1.0_head/ | grep DIR | wc -l)
     if [ "$ret" -le 2 ];
     then