Commit Graph

1212 Commits

Author SHA1 Message Date
Sage Weil
a0e5aa5c8a Merge remote-tracking branch 'gh/jewel' 2016-03-25 15:49:23 -04:00
Gregory Farnum
6bbc6b50bb Merge pull request #7901 from jcsp/wip-pycephfs-fixes
libcephfs: fix python tests and fix getcwd on missing dir

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-03-23 17:05:22 -07:00
Loic Dachary
eb583cbbbf build/ops: in jessie virtualenv is in package virtualenv
The python scripts are not yet compatible with python3, yet it is the
default on jessie. Force the creation of the virtualenv to use python2.7
instead. The wheelhouse is already explicitly populated for both python3
and python2.7 by install-deps.sh, regardless of the default interpreter.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 19:56:11 +01:00
Sage Weil
df6570c2bd Merge pull request #8222 from SUSE/wip-14984
systemd: set up environment in rbdmap unit file

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 12:33:39 -04:00
Samuel Just
3156ebf9ed Merge pull request #8266 from athanatos/wip-test-exit-value
Test exit values on test.sh, fix tier.cc

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-22 11:24:53 -07:00
Samuel Just
926f8ed77b qa/workunits/rados/test.sh: check subprocess return values
Fixes: #15165
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-22 11:23:48 -07:00
Nathan Cutler
0effb9e385 qa: test_rbdmap_RBDMAPFILE.sh workunit
Before a7a3658 the rbdmap script was logging bogus messages and not working
on systemd platforms because the unit file was not defining the RBDMAPFILE
environment variable.

This workunit asserts that the bug has been fixed.

http://tracker.ceph.com/issues/14984 References: #14984

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-20 22:50:47 +01:00
Jason Dillaman
f65cc6fc31 Merge pull request #8172 from trociny/fix-test-rbd-mirror-position
test: rbd-mirror: compare positions using all fields

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 16:33:36 -04:00
Jason Dillaman
f938586451 Merge pull request #8221 from jdurgin/wip-test-rbd-mirror
qa: add workunit to run ceph_test_rbd_mirror

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 16:18:19 -04:00
Sage Weil
5c5a50745f Merge pull request #8191 from liewegas/wip-15180
qa/workunits/rest/test.py: don't use newfs

Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-19 09:13:23 -04:00
Josh Durgin
9f6ec704db qa: add workunit to run ceph_test_rbd_mirror
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 17:23:52 -07:00
Josh Durgin
62771e4a92 Merge pull request #8182 from trociny/wip-rbd-mirror-args
rbd-mirror: make remote context respect env and argv config params

Conflicts:
	qa/workunits/rbd/rbd_mirror.sh (asok command format changed)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 15:03:33 -07:00
Josh Durgin
c6c4f6095a Merge pull request #8159 from trociny/wip-rbd-mirror-asok
rbd-mirror: use pool/image names in asok commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 14:58:58 -07:00
Jason Dillaman
d9017fb95c qa/workunits/rbd: new online maintenance op tests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 14:33:20 -04:00
Sage Weil
811b8f5e3c qa/workunits/rest/test.py: don't use newfs
It doesn't work anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 09:51:31 -04:00
Sage Weil
f6f9c00b33 Merge pull request #8121 from liewegas/wip-15136
mon: remove 'mds setmap'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-18 09:44:05 -04:00
Mykola Golub
13c7ba4c67 test: rbd-mirror: different log and asok location for local/remote contexts
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-17 14:46:21 +02:00
Mykola Golub
b15ff2f419 test: rbd-mirror: compare positions using all fields
Comparing by only entry_tid may give false positives.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-16 23:07:07 +02:00
Mykola Golub
e348a7e4e8 rbd-mirror: use pool/image names in asok commands
Now the commands look similar to rbd cache asok commands.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-16 22:55:00 +02:00
Jason Dillaman
50b53eaf4b qa/workunits/rbd: rbd_mirror was extracting the incorrect image id
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 10:01:38 -04:00
Jason Dillaman
f2e39888d0 qa/workunits/rbd: use unique logs for each rbd-mirror daemon
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 10:01:38 -04:00
Gregory Farnum
fcce59e46d Merge pull request #7713 from ukernel/wip-filelock-deadlock
Wip filelock deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-15 12:25:56 -07:00
Sage Weil
d5c5085064 Merge pull request #8114 from liewegas/wip-tmap-migrate
qa/workunits/rados/test.sh: test tmap_migrate
2016-03-15 11:21:12 -04:00
Josh Durgin
129d83b84f Merge pull request #8090 from trociny/fixup-rbd-mirror-test
test: fixup and improvements for rbd-mirror test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 08:20:43 -07:00
Jason Dillaman
36af39cdf4 qa/workunits/rbd: disable deep-flatten during permissions testing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 11:05:02 -04:00
Sage Weil
6a80e2df8b qa/workunits: remove 'mds setmap' from workunits
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-15 09:44:19 -04:00
Sage Weil
22fe493268 qa/workunits/rados/test.sh: test tmap_migrate
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-15 08:38:05 -04:00
Mykola Golub
8e41220d34 test: fixup and improvements for rbd-mirror test
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-15 10:18:33 +02:00
Jason Dillaman
aef7f9e268 qa/workunits/rbd: do not use object map during read flag testing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-14 17:06:41 -04:00
John Spray
aed1872a1c qa: add test_python for cephfs
Borrowed this from rados/test_python.  It's for
invoking the test that lives in src/test/pybind/test_cephfs.py

Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-14 12:32:56 +00:00
Josh Durgin
750701b644 Merge pull request #8068 from SUSE/wip-15104
qa/workunits/rbd: use POSIX function definition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-11 17:48:43 -08:00
Nathan Cutler
996be8ef49 qa/workunits/rbd: use POSIX function definition
In scripts with /bin/sh shebang, we must use POSIX function definitions to
avoid syntax errors on platforms that link /bin/sh to something other than
/bin/bash.

See https://wiki.ubuntu.com/DashAsBinSh#function for more information.

http://tracker.ceph.com/issues/15104 Fixes: #15104

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-12 02:03:27 +01:00
Josh Durgin
b1f0cb902a Merge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async
rbd-mirror: ImageReplayer async start/stop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-11 11:24:12 -08:00
Gregory Farnum
a7a0dac6a4 Merge pull request #6953 from jcsp/wip-fsmap
Multi-filesystem support

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-11 09:36:30 -08:00
Sage Weil
5d745b2bee Merge pull request #7982 from liewegas/wip-14606
qa/workunits/rest/test.py: add confirmation to 'mds setmap'
2016-03-11 10:30:53 -05:00
Sage Weil
c9124548e4 Merge pull request #8004 from liewegas/wip-rados-test-stderr
qa/workunits/rados/test.sh: capture stderr too
2016-03-11 10:29:39 -05:00
Mykola Golub
3295253d64 test: add rbd-mirror test script
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-11 16:12:00 +02:00
Mykola Golub
866a704882 test: rbd_mirror_image_replay improve commit position parsing
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-11 16:12:00 +02:00
John Spray
22ff1224fd qa: update cephtool test for CephFS multi filesystems
Includes adding test for the enable_multiple flag.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-10 11:18:28 +00:00
Sage Weil
2b9775db2c Merge pull request #7890 from liewegas/wip-reweight
mon: osd [test-]reweight-by-{pg,utilization} command updates

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-09 14:06:30 -05:00
Sage Weil
bd6c64da23 qa/workunits/rados/test.sh: capture stderr too
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-09 13:37:10 -05:00
Sage Weil
661891aa28 mon: remove range=100 from reweight-by-* commands
Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-09 13:25:55 -05:00
Sage Weil
2dc78c86d8 Merge pull request #7552 from dachary/wip-14669-key-management
ceph-disk: key management support

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-09 10:31:53 -05:00
Sage Weil
bdcc84042c qa/workunits/rest/test.py: add confirmation to 'mds setmap'
Broken when we added the confirmation in
fc3554e36a

Fixes: #14606
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-08 14:34:40 -05:00
Sage Weil
3a72d21e30 Merge pull request #7861 from tchaikov/wip-14910
qa/workunits/cephtool/test.sh: wait longer in ceph_watch_start()

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-07 12:23:46 -05:00
Loic Dachary
94c5df4567 tests: verify ceph-disk lockbox activation scenarii
Simulate the cases where the activation (via udev running trigger)
sequences are:

* journal then lockbox
* data then lockbox
* lockbox

All of them must end with the OSD verfied to be up.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-04 09:13:35 +07:00
Loic Dachary
ed56cef1f1 tests: make ceph-disk workunit resilient to non ascii
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-04 09:13:35 +07:00
Loic Dachary
869eb3af80 tests: verify ceph-disk activate-lockbox
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-04 09:13:35 +07:00
Loic Dachary
1ec58fcfc8 ceph-disk: implement lockbox key management
Instead of storing the dmcrypt keys in the /etc/ceph/dmcrypt-keys
directory, they are stored in the monitor. If a machine with
OSDs created with ceph-disk prepare --dmcrypt is lost, it does
not contain the key that would allow to decrypt their content.

The dmcrypt key is retrieved from the monitor using a different keyring
for each OSD. It is stored in a small partition called the lockbox. At
boot time the lockbox is mounted

    /var/lib/ceph/osd-lockbox/$uuid

and used when the $uuid partition is detected by udev to map it with
cryptsetup.

The OSDs that were prepared prior to the lockbox implementation are
supported by looking up the key found in /etc/ceph/dmcrypt-keys before
looking in /var/lib/ceph/osd-lockbox/$uuid.

http://tracker.ceph.com/issues/14669 Fixes: #14669

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-04 09:13:35 +07:00
Sage Weil
28b33a5b57 qa/workunits/cephtool/test.sh: test reweight-by-x commands
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-03 13:49:06 -05:00