]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: enable make check on ext4 (part 2) 9063/head
authorLoic Dachary <ldachary@redhat.com>
Mon, 2 May 2016 08:42:24 +0000 (10:42 +0200)
committerLoic Dachary <ldachary@redhat.com>
Wed, 11 May 2016 07:57:16 +0000 (09:57 +0200)
Followup of 475cc08c330e639b226f2ab57dedbe4495f63022

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit b0b3a068d4fcc7b739c5dd3d68297e2d517c378e)

src/ceph-disk/tests/ceph-disk.sh
src/test/ceph_objectstore_tool.py
src/test/vstart_wrapper.sh

index 479e319b387f25468bc1698c4b532f34e21bd55f..74bc46b6ebf0636314ffeda8dfe07692e03810df 100644 (file)
@@ -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"
index 91804751465e6405562fbff3d0dda4090c53e4d4..ed79286d657c99672a335471b9270481443b9a08 100755 (executable)
@@ -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"
 
 
index 4e54868b157dfb553cb3999fe94a49dc5bf8a967..5c5a3501e9285e16548924161e0f25dff2a4ea61 100755 (executable)
@@ -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