Merge pull request #9063 from dachary/wip-15838-jewel

jewel: tests: make check fails on ext4 Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · May 11, 2016 · a614858 · a614858
2 parents 7a4810d + 48b732f
commit a614858
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
@@ -601,6 +601,8 @@ function activate_osd() {
     ceph_args+=" --debug-osd=20"
     ceph_args+=" --log-file=$dir/\$name.log"
     ceph_args+=" --pid-file=$dir/\$name.pid"
+    ceph_args+=" --osd-max-object-name-len 460"
+    ceph_args+=" --osd-max-object-namespace-len 64"
     ceph_args+=" "
     ceph_args+="$@"
     mkdir -p $osd_data

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
@@ -64,6 +64,8 @@ CEPH_ARGS+=" --debug-mon=20"
 CEPH_ARGS+=" --debug-osd=20"
 CEPH_ARGS+=" --debug-bdev=20"
 CEPH_ARGS+=" --debug-bluestore=20"
+CEPH_ARGS+=" --osd-max-object-name-len=460"
+CEPH_ARGS+=" --osd-max-object-namespace-len=64"
 CEPH_DISK_ARGS=
 CEPH_DISK_ARGS+=" --statedir=$DIR"
 CEPH_DISK_ARGS+=" --sysconfdir=$DIR"

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
@@ -139,7 +139,7 @@ def cat_file(level, filename):
 def vstart(new, opt=""):
     print "vstarting....",
     NEW = new and "-n" or ""
-    call("MON=1 OSD=4 CEPH_PORT=7400 {path}/src/vstart.sh -l {new} -d mon osd {opt} > /dev/null 2>&1".format(new=NEW, opt=opt, path=CEPH_ROOT), shell=True)
+    call("MON=1 OSD=4 CEPH_PORT=7400 {path}/src/vstart.sh --short -l {new} -d mon osd {opt} > /dev/null 2>&1".format(new=NEW, opt=opt, path=CEPH_ROOT), shell=True)
     print "DONE"
 
 

diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh
@@ -31,6 +31,7 @@ function vstart_setup()
     export LC_ALL=C # some tests are vulnerable to i18n
     export PATH="$(pwd):${PATH}"
     $CEPH_ROOT/src/vstart.sh \
+        --short \
         -o 'paxos propose interval = 0.01' \
         -n -l $CEPH_START || return 1
     export CEPH_CONF=$CEPH_DIR/ceph.conf