Commit Graph

44729 Commits

Author SHA1 Message Date
Loic Dachary
fb4dd7d4f2 tests: ceph-disk: inline run_osd
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
24b3a800e6 tests: ceph-disk: wait for the OSD to be up
After preparing an OSD, wait for the corresponding OSD to be up
according to ceph osd dump before asserting the devices are in the
expected state. Otherwise the test races with ceph-disk activate which
is run asynchronously via udev / upstart / system.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
46a3c93ab3 tests: ceph-disk: race condition is fixed
It turns out it was not CentOS 7 specific. There is no excuse to skip
the tests anymore.

http://tracker.ceph.com/issues/12787 Refs: #12787

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
d24f1f10aa tests: ceph-disk: multipath now auto activates
http://tracker.ceph.com/issues/12786 Refs: #12786

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
d4d5153cd4 tests: ceph-disk: use sh() instead of helper() when possible
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
b6470382f8 tests: doc: ceph-disk workunit reminders
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
22a1f4cf74 ceph-disk: reduce debug verbosity
There is no need for debug traces from which() and it is very
noisy. Just get rid of it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
c86438cdce ceph-disk: ensure udev add on the data partition is last
When calling partprobe, we make sure there is at least one udev add
called for each partition created when preparing a device. But there is
no guarantee that the udev add for data partition will be last and the
following scenario can happen:

 - udev add data partition fails because the journal partition is owned
   by root
 - udev add journal partition chown the journal partition
 - no other udev add event is sent and the OSD does not activate

An additional, possibly redundant, udev add event is fired after
partprobe is run and after udevadm settles, to guarantee there is at
least one udev add data partition after the last udev add journal
partition.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
0dd2364984 ceph-disk: move update_partition from main_prepare to prepare_dev
The update_partition call in main_prepare happens immediately after
prepare_dev but only if the data argument is a block device. There is no
reason for this separation: it is more sensible to call it from within
prepare_dev.

There is an additional test in prepare_dev that verifies partprobe won't
be called on a partition because it would not make sense.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
e2c553ee95 ceph-disk: guard partprobe with udevadm settle
Call udevadm settle before and after partprobe.

A side effect of partprobe is to remove partitions and add them again.
The first udevadm settle waits for ongoing udev events to complete, just
in case one of them rely on an existing partition on dev.

The second udevadm settle guarantees to the caller that all udev events
related to the partition table change have been processed, i.e. the
95-ceph-osd.rules actions and mode changes, group changes etc. are
complete.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
ad2d46ce85 ceph-disk: do not hide ceph-disk prepare stack trace
raise without an argument so the original stack trace is shown when
ceph-disk prepare fails.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
5aeca731aa ceph-disk: support --verbose with --log-stdout
Set the LOG level as well as the channel level, otherwise the debug
messages are trimmed before they reach the channel. Also set the prefix
while we're at it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
9e796dc8b2 ceph-disk: prefer sgdisk to blkid to retrieve partition UUID
blkid 2.23.2 which is the default for official CentOS 7 cloud images
fails on journal device. It would be better to use blkid because it does
not trigger udev events, but it is more important to get reliable
results.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
3d0e7ca6cb ceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb
The ceph-disk list argument must be the device name without the leading
/dev/. This is error prone and silently does nothing. Strip the /dev/
prefix of ceph-disk list arguments so that it behaves as expected.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
6ca6653d33 ceph-disk: - is translated into / with systemd
When running ceph-disk trigger /dev/dm-1 with systemd, the path name is
translated into /dev/dm/1 because of systemd escape rules. Explicitly
translate - into \x2d for systemd to preserve the -.

It would be better to use systemd-escape
http://www.freedesktop.org/software/systemd/man/systemd-escape.html
but it does not appear to be generally available on CentOS 7 and
probably other distributions.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
17c6045773 ceph-disk: a journal partition may survive a data partition
When a data partition is removed and the journal partition is not
removed, ceph-disk list will not find a journal_for information and
should just ignore it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
d521a75061 ceph-disk: upstart must not run ceph-disk activate concurrently
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
f0a47578c7 ceph-disk: systemd must not kill a running ceph-disk
When activating a device, ceph-disk trigger restarts the ceph-disk
systemd service. Two consecutive udev add on the same device will
restart the ceph-disk systemd service and the second one may kill the
first one, leaving the device half activated.

The ceph-disk systemd service is instructed to not kill an existing
process when restarting. The second run waits (via flock) for the second
one to complete before running so that they do not overlap.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
cc13fa05fd ceph-disk: fix typos in udev rules
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Loic Dachary
b86d9fd973 ceph-disk: ensure ceph owner on udev change
On udev change the owner of the device switch back to the default. If
that happens on a journal while an OSD is being activated, it will fail
with permission denied.

Make sure all ceph device types are chown to ceph on udev change.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00
Josh Durgin
19a480b76d Merge pull request #5750 from wonzhq/rbd-write-full
librbd: do write_full for whole object write

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-21 19:13:37 -04:00
Gregory Farnum
ac2953a4d7 Merge pull request #5416 from zhouyuan/ceph_fuse_12204
ceph-fuse: warn and shut down when there is no MDS present

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 16:02:33 -07:00
Gregory Farnum
42c657a6a9 Merge pull request #5826 from ukernel/wip-osx-port
fix compilation on OSX/FreeBSD

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:57:13 -07:00
Greg Farnum
fe54bd1bbe Merge branch 'wip-12971' of git://github.com/jcsp/ceph
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Conflicts:
	src/osdc/Objecter.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:55:04 -07:00
Gregory Farnum
2c5dcd34c1 Merge pull request #5644 from majianpeng/mds-support-iohint
Mds journal support iohint

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-21 15:52:10 -07:00
Gregory Farnum
76e2e6271c Merge pull request #5966 from ukernel/wip-12506
Wip 12506

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:50:28 -07:00
Gregory Farnum
cb7786b17b Merge pull request #5962 from majianpeng/client-fix
Client fix mini bugs.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:49:34 -07:00
Sage Weil
e664547c22 Merge pull request #6014 from athanatos/wip-13108
Revert "osd: purge the object from the cache when proxying and not pr…

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:51:50 -04:00
Sage Weil
4e7fb86e29 Merge pull request #6015 from athanatos/wip-13143
osd/: find_object_context: return obc for head for snapdir if non null

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:51:07 -04:00
Sage Weil
6f2c2aa6fa Merge pull request #6017 from athanatos/wip-13150
ReplicatedPG::get_snapset_context: set exists to false for new ssc wi…

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:46:33 -04:00
Sage Weil
0bfefdf5b6 Merge pull request #6013 from athanatos/wip-12828
Wip 12828

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:43:55 -04:00
Yehuda Sadeh
7bb316fbc8 Merge pull request #5918 from oritwas/wip-5378
rgw: make radosgw-admin user rm idempotent

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-21 08:35:30 -07:00
Yehuda Sadeh
63be27977e Merge pull request #5996 from rzarzynski/wip-12780
rgw: don't read actual data on user manifest HEAD
2015-09-21 08:22:29 -07:00
Yehuda Sadeh
17b68616c3 Merge pull request #5974 from Sandy4999/wip-rgw-errmsg
rgw: add a new error message for user conflict when using Admin Ops API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-21 08:20:55 -07:00
John Spray
07aa448062 Merge pull request #6003 from ukernel/wip-13166
Wip 13166

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-21 10:25:39 +01:00
Yan, Zheng
e65fb1ba70 mds: adjust MDSRank::incarnation according to mdsmap
When a standby-replay MDS replace failed MDS, we need update its
incarnation.

Fixes: #13166
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-21 15:42:10 +08:00
Sage Weil
c4b2d12ad5 Merge pull request #6001 from dachary/wip-13182-crushtool
tests: update to match crushmap validation message
2015-09-20 20:57:13 -04:00
Loic Dachary
21a1e75d8a tests: update to match crushmap validation message
http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-21 00:13:08 +02:00
Sage Weil
5e8299f012 Merge remote-tracking branch 'gh/infernalis' 2015-09-20 13:54:19 -04:00
Sage Weil
782855e7d6 Merge pull request #5979 from ceph/wip-crushtest
mon: fix crush testing for new pools

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-20 13:50:26 -04:00
Sage Weil
b41408302b Merge pull request #5950 from tchaikov/wip-13112-infernalis
mon/PGMap: calc min_last_epoch_clean when decode

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-20 13:49:36 -04:00
Loic Dachary
642cbd880a Merge pull request #5998 from dachary/wip-13136-python3-coverage
install-deps: enable python3
2015-09-20 17:12:32 +02:00
Loic Dachary
4da6793d8d install-deps: enable python3
The upstream regression has been fixed, we can re-enable python3
support.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-20 13:18:40 +02:00
Sage Weil
f7eb1d8ce6 Merge pull request #5994 from SUSE/wip-13175
doc: do not promise backports to Dumpling

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-19 17:21:10 -04:00
Nathan Cutler
170f9add76 doc: do not promise backports to Dumpling
Dumpling was retired in May 2015.

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

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-09-19 22:30:59 +02:00
John Spray
210156f3d2 Merge pull request #5965 from jcsp/wip-get-or-create-output
mon: fix auth get-or-create output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-19 12:03:57 +01:00
Ken Dreyer
498006b390 Merge pull request #5984 from ceph/wip-packages
Fixes locations from ceph.com to download.ceph.com

(For the record, this is to fix http://tracker.ceph.com/issues/13162)

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-18 12:42:15 -06:00
Alfredo Deza
a6f07e9fa3 doc: remove mention of ceph-extra as a requirement
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:20:12 -04:00
Alfredo Deza
c0ef84fd22 doc: remove ceph-extras
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:19:31 -04:00
Alfredo Deza
387d780035 doc: correct links to download.ceph.com
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:19:27 -04:00