]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: set default value for env->get() call 6110/head
Yehuda Sadeh [Fri, 25 Sep 2015 17:44:40 +0000 (10:44 -0700)]
rgw: set default value for env->get() call

Fixes: #13239
This fixes a regression introduced at commit abe4ec293d08b0314bf5c081ace2456073f3a22c.
The host var is a string, env->get() returns a char pointer, shouldn't
pass in NULL.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6068 from dachary/wip-12936-shec
Sage Weil [Sat, 26 Sep 2015 05:24:22 +0000 (01:24 -0400)]
Merge pull request #6068 from dachary/wip-12936-shec

erasure-code: shec must compare for equality with epsilon

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoerasure-code: shec must compare for equality with epsilon 6068/head
Loic Dachary [Thu, 24 Sep 2015 09:35:13 +0000 (11:35 +0200)]
erasure-code: shec must compare for equality with epsilon

When comparing two double for strict inequality, a test for equality
using epsilon must also be done to ensure the results do not vary cross
platform.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Fri, 25 Sep 2015 12:59:54 +0000 (08:59 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #6048 from XinzeChi/wip-filestore-qlock
Sage Weil [Fri, 25 Sep 2015 12:56:02 +0000 (08:56 -0400)]
Merge pull request #6048 from XinzeChi/wip-filestore-qlock

filestore: fix peek_queue for OpSequencer

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6040 from liewegas/wip-mon-kv
Sage Weil [Fri, 25 Sep 2015 12:53:53 +0000 (08:53 -0400)]
Merge pull request #6040 from liewegas/wip-mon-kv

mon: some fixes for kv backend failures

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #6022 from jdurgin/wip-13032
Sage Weil [Fri, 25 Sep 2015 12:53:00 +0000 (08:53 -0400)]
Merge pull request #6022 from jdurgin/wip-13032

msg: randomize client nonces

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6012 from liewegas/wip-mon
Sage Weil [Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)]
Merge pull request #6012 from liewegas/wip-mon

mon: misc scaling fixes

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6027 from wido/mirror-docs
Kefu Chai [Fri, 25 Sep 2015 11:16:08 +0000 (19:16 +0800)]
Merge pull request #6027 from wido/mirror-docs

docs: Update docs to make it clear that there are mirrors worldwide

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6031 from s09816/master
Josh Durgin [Thu, 24 Sep 2015 22:35:13 +0000 (18:35 -0400)]
Merge pull request #6031 from s09816/master

librbd:reads larger than cache size hang.

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6072 from yuyuyu101/update-org
Loic Dachary [Thu, 24 Sep 2015 14:19:43 +0000 (16:19 +0200)]
Merge pull request #6072 from yuyuyu101/update-org

Update org

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoUpdate Xinze affinity 6072/head
Haomai Wang [Thu, 24 Sep 2015 13:58:51 +0000 (21:58 +0800)]
Update Xinze affinity

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #6066 from dachary/wip-ceph-detect-init
Kefu Chai [Thu, 24 Sep 2015 13:57:31 +0000 (21:57 +0800)]
Merge pull request #6066 from dachary/wip-ceph-detect-init

build/ops: ceph-detect-init must ignore .cache

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoUpdate Chen Min affinity
Haomai Wang [Thu, 24 Sep 2015 13:56:17 +0000 (21:56 +0800)]
Update Chen Min affinity

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoUpdate Tianshan affinity
Haomai Wang [Thu, 24 Sep 2015 13:55:21 +0000 (21:55 +0800)]
Update Tianshan affinity

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoUpdate Haomai Wang affinity
Haomai Wang [Thu, 10 Sep 2015 04:11:22 +0000 (12:11 +0800)]
Update Haomai Wang affinity

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agodocs: Update docs to make it clear that there are mirrors worldwide 6027/head
Wido den Hollander [Tue, 22 Sep 2015 09:09:02 +0000 (11:09 +0200)]
docs: Update docs to make it clear that there are mirrors worldwide

9 years agoMerge pull request #6063 from dachary/wip-tar-v7
Kefu Chai [Thu, 24 Sep 2015 09:23:03 +0000 (17:23 +0800)]
Merge pull request #6063 from dachary/wip-tar-v7

build/ops: make dist needs files with names > 99 characters

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agobuild/ops: ceph-detect-init must ignore .cache 6066/head
Loic Dachary [Thu, 24 Sep 2015 08:54:35 +0000 (10:54 +0200)]
build/ops: ceph-detect-init must ignore .cache

In case the test fails, it may leave files behind:

src/ceph-detect-init/.cache/v/cache/lastfailed

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5694 from guce/rgw_improve_key_operate
Orit Wasserman [Thu, 24 Sep 2015 08:08:13 +0000 (10:08 +0200)]
Merge pull request #5694 from guce/rgw_improve_key_operate

rgw: improve convenience for key operate.

9 years agolibrbd:reads larger than cache size hang. 6031/head
Lu Shi [Thu, 24 Sep 2015 08:02:41 +0000 (16:02 +0800)]
librbd:reads larger than cache size hang.

Fixes:#13164

Signed-off-by: Lu Shi <shi.lu@h3c.com>
9 years agobuild/ops: make dist needs files with names > 99 characters 6063/head
Loic Dachary [Thu, 24 Sep 2015 05:53:38 +0000 (07:53 +0200)]
build/ops: make dist needs files with names > 99 characters

When running make distdir=ceph-9.0.3-1870-gfd861bb dist, a few files
have names longer than 99 characters and discarded, which then causes
the resulting tarbal to be incomplete:

tar: ceph-9.0.3-1870-gfd861bb/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc: file name is too long (max 99); not dumped
tar: ceph-9.0.3-1870-gfd861bb/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h: file name is too long (max 99); not dumped

Use the tar-ustar format instead of the legacy v7
format (http://www.gnu.org/software/automake/manual/automake.html#Options). It
is unlikely machines with a C++11 compiler also have an antique tar
binary that would only support v7.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agofilestore: fix peek_queue for OpSequencer 6048/head
Xinze Chi [Wed, 23 Sep 2015 11:26:00 +0000 (19:26 +0800)]
filestore: fix peek_queue for OpSequencer

Fixes: #13209
Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agoMerge pull request #6053 from ceph/wip-cmake-dang
Sage Weil [Wed, 23 Sep 2015 21:00:48 +0000 (17:00 -0400)]
Merge pull request #6053 from ceph/wip-cmake-dang

Wip cmake dang

9 years agoMerge pull request #6056 from guangyy/wip-13198
Sage Weil [Wed, 23 Sep 2015 20:59:06 +0000 (16:59 -0400)]
Merge pull request #6056 from guangyy/wip-13198

osd: print min_last_epoch_clean along with pg dump

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/wip-aarch64'
Sage Weil [Wed, 23 Sep 2015 19:08:22 +0000 (15:08 -0400)]
Merge remote-tracking branch 'gh/wip-aarch64'

9 years agoosd: print min_last_epoch_clean along with pg dump 6056/head
Guang Yang [Wed, 23 Sep 2015 15:58:02 +0000 (15:58 +0000)]
osd: print min_last_epoch_clean along with pg dump

Fixes: 13198
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
9 years agomon/Elector: do a trivial write on every election cycle 6040/head
Sage Weil [Wed, 23 Sep 2015 14:58:01 +0000 (10:58 -0400)]
mon/Elector: do a trivial write on every election cycle

Currently we already do a small write when the *first* election in
a round happens (to update the election epoch).  If the backend
happens to fail while we are already in the midst of elections,
however, we may continue to call elections without verifying we
are still writeable.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonitorDBStore: assert/crash if there is a write error
Sage Weil [Wed, 23 Sep 2015 14:58:13 +0000 (10:58 -0400)]
mon/MonitorDBStore: assert/crash if there is a write error

Do this globally intead of relying on teh zillion mon callers to
check the error code.  There are no cases where we want to
tolerate a commit failure.

Fixes: #13089
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoCMake - fix check for UDEV 6053/head
Daniel Gryniewicz [Mon, 21 Sep 2015 16:52:02 +0000 (12:52 -0400)]
CMake - fix check for UDEV

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for FUSE
Daniel Gryniewicz [Mon, 21 Sep 2015 16:44:28 +0000 (12:44 -0400)]
CMake - fix check for FUSE

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - add check for libedit
Daniel Gryniewicz [Mon, 21 Sep 2015 16:29:51 +0000 (12:29 -0400)]
CMake - add check for libedit

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for Snappy
Daniel Gryniewicz [Mon, 21 Sep 2015 16:25:05 +0000 (12:25 -0400)]
CMake - fix check for Snappy

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - add check for XFS
Daniel Gryniewicz [Mon, 21 Sep 2015 16:18:43 +0000 (12:18 -0400)]
CMake - add check for XFS

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for AIO
Daniel Gryniewicz [Mon, 21 Sep 2015 15:59:30 +0000 (11:59 -0400)]
CMake - fix check for AIO

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for blkid
Daniel Gryniewicz [Mon, 21 Sep 2015 15:52:48 +0000 (11:52 -0400)]
CMake - fix check for blkid

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - add check for libcurl
Daniel Gryniewicz [Mon, 21 Sep 2015 15:50:45 +0000 (11:50 -0400)]
CMake - add check for libcurl

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for fcgi
Daniel Gryniewicz [Mon, 21 Sep 2015 15:42:53 +0000 (11:42 -0400)]
CMake - fix check for fcgi

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - add check for libuuid
Daniel Gryniewicz [Mon, 21 Sep 2015 15:37:18 +0000 (11:37 -0400)]
CMake - add check for libuuid

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for leveldb
Daniel Gryniewicz [Mon, 21 Sep 2015 15:20:19 +0000 (11:20 -0400)]
CMake - fix check for leveldb

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for expat
Daniel Gryniewicz [Mon, 21 Sep 2015 15:10:07 +0000 (11:10 -0400)]
CMake - fix check for expat

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - Add check for keyutils
Daniel Gryniewicz [Mon, 21 Sep 2015 15:08:19 +0000 (11:08 -0400)]
CMake - Add check for keyutils

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix check for NSS
Daniel Gryniewicz [Mon, 21 Sep 2015 14:57:26 +0000 (10:57 -0400)]
CMake - fix check for NSS

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoCMake - fix libatomic_ops and gperftools checks
Daniel Gryniewicz [Mon, 21 Sep 2015 14:37:19 +0000 (10:37 -0400)]
CMake - fix libatomic_ops and gperftools checks

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Wed, 23 Sep 2015 14:46:51 +0000 (10:46 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoarch/arm: s/false/0/
Sage Weil [Wed, 23 Sep 2015 12:20:39 +0000 (08:20 -0400)]
arch/arm: s/false/0/

arch/arm.c: In function 'ceph_arch_arm_probe':
arch/arm.c:54:28: error: 'false' undeclared (first use in this function)
  ceph_arch_aarch64_crc32 = false;  // sorry!
                            ^
arch/arm.c:54:28: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorgw: improve convenience for key operate. 5694/head
guce [Wed, 23 Sep 2015 01:52:06 +0000 (09:52 +0800)]
rgw: improve convenience for key operate.

1.key-type assignments based on context if it wasn't specified
In user    operate context, key-type assignment to KEY_TYPE_S3
In subuser operate context, key-type assignment to KEY_TYPE_SWIFT
In key     operate context, key-type assignment based on user type

2.fix RGWSubUserPool::add()
When create subuser generate secret by default

3.fix RGWAccessKeyPool::generate_key()
Avoid wrong key's username when create user and subuser at the same time
Check empty secret

Signed-off-by: Ce Gu <guce@h3c.com>
9 years agoMerge pull request #6037 from liewegas/wip-12407
Sage Weil [Tue, 22 Sep 2015 19:12:17 +0000 (15:12 -0400)]
Merge pull request #6037 from liewegas/wip-12407

init-radosgw: fix restart w/ multiple instances

Reviewed-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
9 years agoMerge pull request #5928 from ceph/wip-12819-infernalis
Orit Wasserman [Tue, 22 Sep 2015 18:29:10 +0000 (20:29 +0200)]
Merge pull request #5928 from ceph/wip-12819-infernalis

Wip 12819 infernalis

9 years agoMerge pull request #6006 from dachary/wip-12936-shec
Loic Dachary [Tue, 22 Sep 2015 18:27:57 +0000 (20:27 +0200)]
Merge pull request #6006 from dachary/wip-12936-shec

erasure-code: workaround i386 optimization bug with SHEC

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoinit-radosgw: specify pid file to start-stop-daemon 6037/head
Sage Weil [Tue, 22 Sep 2015 18:12:02 +0000 (14:12 -0400)]
init-radosgw: specify pid file to start-stop-daemon

This fixes restart when multiple instances are running.

Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Tue, 22 Sep 2015 18:04:44 +0000 (14:04 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5922 from trociny/wip-pool-set-noscrub
David Zafman [Tue, 22 Sep 2015 16:32:18 +0000 (09:32 -0700)]
Merge pull request #5922 from trociny/wip-pool-set-noscrub

osd: per pool control for scrub and deep-scrub

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5846 from xiexingguo/xxg-wip-13002
Kefu Chai [Tue, 22 Sep 2015 15:54:32 +0000 (23:54 +0800)]
Merge pull request #5846 from xiexingguo/xxg-wip-13002

msg/simple: start over after fails to bind a port in specified range

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoerasure-code: workaround i386 optimization bug with SHEC 6006/head
Loic Dachary [Mon, 21 Sep 2015 13:36:54 +0000 (15:36 +0200)]
erasure-code: workaround i386 optimization bug with SHEC

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5999 from dachary/wip-13000-ceph-disk
Loic Dachary [Tue, 22 Sep 2015 14:29:16 +0000 (16:29 +0200)]
Merge pull request #5999 from dachary/wip-13000-ceph-disk

ceph-disk: fixes various race conditions

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6008 from liewegas/wip-13190
Samuel Just [Tue, 22 Sep 2015 14:24:27 +0000 (07:24 -0700)]
Merge pull request #6008 from liewegas/wip-13190

osd/ReplicatedPG: tolerate promotion completion with stopped agent

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6011 from liewegas/wip-systemd
Sage Weil [Tue, 22 Sep 2015 13:32:08 +0000 (09:32 -0400)]
Merge pull request #6011 from liewegas/wip-systemd

systemd: increase nproc ulimit

9 years agoMerge pull request #6019 from liewegas/wip-mon-dispatch-debug
Sage Weil [Tue, 22 Sep 2015 12:29:16 +0000 (08:29 -0400)]
Merge pull request #6019 from liewegas/wip-mon-dispatch-debug

mon/PaxosService: include msg and con ptr in dispatch debug

9 years agoMerge pull request #5956 from xinxinsh/wip-13124
Josh Durgin [Tue, 22 Sep 2015 07:07:43 +0000 (03:07 -0400)]
Merge pull request #5956 from xinxinsh/wip-13124

unify order limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: ceph-disk: workunit must fail when test fail 5999/head
Loic Dachary [Sun, 20 Sep 2015 22:23:26 +0000 (00:23 +0200)]
tests: ceph-disk: workunit must fail when test fail

Signed-off-by: Joe Julian <me@joejulian.name>
9 years agotests: ceph-disk: only install multipath on CentOS
Loic Dachary [Sun, 20 Sep 2015 20:05:09 +0000 (22:05 +0200)]
tests: ceph-disk: only install multipath on CentOS

If installed on Ubuntu where multipath does not activate properly, it
interferes with the other tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk: inline run_osd
Loic Dachary [Sun, 20 Sep 2015 20:00:54 +0000 (22:00 +0200)]
tests: ceph-disk: inline run_osd

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk: wait for the OSD to be up
Loic Dachary [Sun, 20 Sep 2015 13:05:28 +0000 (15:05 +0200)]
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>
9 years agotests: ceph-disk: race condition is fixed
Loic Dachary [Sun, 20 Sep 2015 13:02:47 +0000 (15:02 +0200)]
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>
9 years agotests: ceph-disk: multipath now auto activates
Loic Dachary [Sun, 20 Sep 2015 12:54:57 +0000 (14:54 +0200)]
tests: ceph-disk: multipath now auto activates

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk: use sh() instead of helper() when possible
Loic Dachary [Sun, 20 Sep 2015 12:54:16 +0000 (14:54 +0200)]
tests: ceph-disk: use sh() instead of helper() when possible

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: doc: ceph-disk workunit reminders
Loic Dachary [Sun, 20 Sep 2015 12:52:22 +0000 (14:52 +0200)]
tests: doc: ceph-disk workunit reminders

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: reduce debug verbosity
Loic Dachary [Sun, 20 Sep 2015 19:54:59 +0000 (21:54 +0200)]
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>
9 years agoceph-disk: ensure udev add on the data partition is last
Loic Dachary [Sun, 20 Sep 2015 12:38:34 +0000 (14:38 +0200)]
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>
9 years agoceph-disk: move update_partition from main_prepare to prepare_dev
Loic Dachary [Sun, 20 Sep 2015 12:34:47 +0000 (14:34 +0200)]
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>
9 years agoceph-disk: guard partprobe with udevadm settle
Loic Dachary [Sun, 20 Sep 2015 12:30:52 +0000 (14:30 +0200)]
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>
9 years agoceph-disk: do not hide ceph-disk prepare stack trace
Loic Dachary [Sun, 20 Sep 2015 12:28:12 +0000 (14:28 +0200)]
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>
9 years agoceph-disk: support --verbose with --log-stdout
Loic Dachary [Sun, 20 Sep 2015 12:23:47 +0000 (14:23 +0200)]
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>
9 years agoceph-disk: prefer sgdisk to blkid to retrieve partition UUID
Loic Dachary [Sun, 20 Sep 2015 12:16:12 +0000 (14:16 +0200)]
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>
9 years agoceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb
Loic Dachary [Sun, 20 Sep 2015 12:12:25 +0000 (14:12 +0200)]
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>
9 years agoceph-disk: - is translated into / with systemd
Loic Dachary [Sun, 20 Sep 2015 12:03:39 +0000 (14:03 +0200)]
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>
9 years agoceph-disk: a journal partition may survive a data partition
Loic Dachary [Sun, 20 Sep 2015 12:00:16 +0000 (14:00 +0200)]
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>
9 years agoceph-disk: upstart must not run ceph-disk activate concurrently
Loic Dachary [Sun, 20 Sep 2015 19:48:11 +0000 (21:48 +0200)]
ceph-disk: upstart must not run ceph-disk activate concurrently

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: systemd must not kill a running ceph-disk
Loic Dachary [Sun, 20 Sep 2015 11:54:05 +0000 (13:54 +0200)]
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>
9 years agoceph-disk: fix typos in udev rules
Loic Dachary [Sun, 20 Sep 2015 11:52:59 +0000 (13:52 +0200)]
ceph-disk: fix typos in udev rules

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk: ensure ceph owner on udev change
Loic Dachary [Sun, 20 Sep 2015 11:50:03 +0000 (13:50 +0200)]
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>
9 years agoMerge pull request #5976 from yuyuyu101/wip-fix-metadata-conf
Josh Durgin [Tue, 22 Sep 2015 05:19:58 +0000 (01:19 -0400)]
Merge pull request #5976 from yuyuyu101/wip-fix-metadata-conf

Librbd: Fix incorrect metadata filter behavior

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5750 from wonzhq/rbd-write-full
Josh Durgin [Mon, 21 Sep 2015 23:13:37 +0000 (19:13 -0400)]
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>
9 years agoMerge pull request #5416 from zhouyuan/ceph_fuse_12204
Gregory Farnum [Mon, 21 Sep 2015 23:02:33 +0000 (16:02 -0700)]
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>
9 years agoMerge pull request #5826 from ukernel/wip-osx-port
Gregory Farnum [Mon, 21 Sep 2015 22:57:13 +0000 (15:57 -0700)]
Merge pull request #5826 from ukernel/wip-osx-port

fix compilation on OSX/FreeBSD

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agouse simplifed messenger constructor for clients 6022/head
Josh Durgin [Mon, 21 Sep 2015 22:46:42 +0000 (15:46 -0700)]
use simplifed messenger constructor for clients

This is all mechanical except the calculation of the nonce, which is
now always randomized for clients.

Fixes: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agomsg: add simplified messenger constructor
Josh Durgin [Mon, 21 Sep 2015 22:20:53 +0000 (15:20 -0700)]
msg: add simplified messenger constructor

Several callers create messengers using exactly the same parameters:

- reading the ms type from cct that is also passed in
- a default entity_name_t::CLIENT
- the default features

Additionally, the nonce should be randomized and not depend on
e.g. pid, as it does in several callers now. Clients running in
containers can easily have pid collisions, leading to hangs, so
randomize the nonce in this simplified constructor rather than
duplicating that logic in every caller.

Daemons have meaningful entity_name_ts, and monitors currently depend
on using 0 as a nonce, so make this simple constructer
client-specific.

Related: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge branch 'wip-12971' of git://github.com/jcsp/ceph
Greg Farnum [Mon, 21 Sep 2015 22:55:04 +0000 (15:55 -0700)]
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>
9 years agoMerge pull request #5644 from majianpeng/mds-support-iohint
Gregory Farnum [Mon, 21 Sep 2015 22:52:10 +0000 (15:52 -0700)]
Merge pull request #5644 from majianpeng/mds-support-iohint

Mds journal support iohint

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5966 from ukernel/wip-12506
Gregory Farnum [Mon, 21 Sep 2015 22:50:28 +0000 (15:50 -0700)]
Merge pull request #5966 from ukernel/wip-12506

Wip 12506

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5962 from majianpeng/client-fix
Gregory Farnum [Mon, 21 Sep 2015 22:49:34 +0000 (15:49 -0700)]
Merge pull request #5962 from majianpeng/client-fix

Client fix mini bugs.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agomon/PaxosService: include msg and con ptr in dispatch debug 6019/head
Sage Weil [Mon, 21 Sep 2015 21:04:50 +0000 (17:04 -0400)]
mon/PaxosService: include msg and con ptr in dispatch debug

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6014 from athanatos/wip-13108
Sage Weil [Mon, 21 Sep 2015 18:51:50 +0000 (14:51 -0400)]
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>
9 years agoMerge pull request #6015 from athanatos/wip-13143
Sage Weil [Mon, 21 Sep 2015 18:51:07 +0000 (14:51 -0400)]
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>
9 years agoMerge pull request #6017 from athanatos/wip-13150
Sage Weil [Mon, 21 Sep 2015 18:46:33 +0000 (14:46 -0400)]
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>
9 years agoMerge pull request #6013 from athanatos/wip-12828
Sage Weil [Mon, 21 Sep 2015 18:43:55 +0000 (14:43 -0400)]
Merge pull request #6013 from athanatos/wip-12828

Wip 12828

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: respect NODOWN on osd failure checks 6012/head
Sage Weil [Sun, 20 Sep 2015 18:49:09 +0000 (14:49 -0400)]
mon/OSDMonitor: respect NODOWN on osd failure checks

Backport: hammer, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agosystemd: increase nproc ulimit 6011/head
Sage Weil [Thu, 17 Sep 2015 22:28:38 +0000 (18:28 -0400)]
systemd: increase nproc ulimit

We were observed to be hitting the limit on centos7
(triggering pthread_create failures) on a ~2000 OSD cluster.

Increasing this resolves it!

Reported-by: Dan van der Ster <daniel.vanderster@cern.ch>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: avoid useless register_new_pgs work
Sage Weil [Thu, 17 Sep 2015 21:13:17 +0000 (17:13 -0400)]
mon/PGMonitor: avoid useless register_new_pgs work

Signed-off-by: Sage Weil <sage@redhat.com>