]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoos/fs: fix aio submit method 6101/head
Sage Weil [Tue, 29 Sep 2015 01:31:23 +0000 (21:31 -0400)]
os/fs: fix aio submit method

continue in a do while(false) will always eval false and break
out.  To repeat, we need while (true) and an explicit break.

Reported-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6078 from H3C/wip-13208
Sage Weil [Mon, 28 Sep 2015 20:42:01 +0000 (16:42 -0400)]
Merge pull request #6078 from H3C/wip-13208

Objecter: maybe access wild pointer(op) in _op_submit_with_budget.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6064 from H3C/wip-rbd-bugfix1
Sage Weil [Mon, 28 Sep 2015 20:41:44 +0000 (16:41 -0400)]
Merge pull request #6064 from H3C/wip-rbd-bugfix1

Objecter: misc fix for segmentation fault.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6084 from liewegas/wip-revert-scrub
Sage Weil [Mon, 28 Sep 2015 20:40:31 +0000 (16:40 -0400)]
Merge pull request #6084 from liewegas/wip-revert-scrub

Revert "osd: new pool settings: scrub intervals"

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #5832 from SUSE/wip-drop-dup-rcceph
Ken Dreyer [Mon, 28 Sep 2015 19:09:33 +0000 (13:09 -0600)]
Merge pull request #5832 from SUSE/wip-drop-dup-rcceph

ceph.spec.in: refrain from duplicating %{_sbindir}/rcceph

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #6098 from liewegas/wip-crash-replay-interval
Samuel Just [Mon, 28 Sep 2015 17:17:41 +0000 (10:17 -0700)]
Merge pull request #6098 from liewegas/wip-crash-replay-interval

don't assume crash_replay_itnerval == 45

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45 6098/head
Sage Weil [Mon, 28 Sep 2015 17:13:40 +0000 (13:13 -0400)]
qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45

e.g., it's 5 in teuthology's ceph.conf.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6076 from liewegas/wip-scrub-fix
Sage Weil [Mon, 28 Sep 2015 15:44:46 +0000 (11:44 -0400)]
Merge pull request #6076 from liewegas/wip-scrub-fix

osd/PG: compensate for sloppy hobject scrub bounds from hammer

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6086 from stiopaa1/librados_missingsemicolon
Loic Dachary [Sat, 26 Sep 2015 14:12:33 +0000 (16:12 +0200)]
Merge pull request #6086 from stiopaa1/librados_missingsemicolon

examples/librados/hello_world.cc:missing semicolon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoexamples/librados/hello_world.cc:missing semicolon 6086/head
Michal Jarzabek [Sat, 26 Sep 2015 13:45:22 +0000 (14:45 +0100)]
examples/librados/hello_world.cc:missing semicolon

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #6052 from liewegas/wip-13098
Sage Weil [Sat, 26 Sep 2015 05:22:39 +0000 (01:22 -0400)]
Merge pull request #6052 from liewegas/wip-13098

osd: fix full request handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6075 from liewegas/wip-osd-getmap
Sage Weil [Sat, 26 Sep 2015 05:22:10 +0000 (01:22 -0400)]
Merge pull request #6075 from liewegas/wip-osd-getmap

osd: avoid duplicate MMonGetOSDMap requests

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6077 from liewegas/wip-qa
Dan Mick [Fri, 25 Sep 2015 18:14:51 +0000 (11:14 -0700)]
Merge pull request #6077 from liewegas/wip-qa

qa: http://ceph.com/qa -> http://download.ceph.com/qa
also some ceph.com/git -> git.ceph.com and a few line-endings - dmick

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoRevert "osd: new pool settings: scrub intervals" 6084/head
Sage Weil [Fri, 25 Sep 2015 18:01:19 +0000 (14:01 -0400)]
Revert "osd: new pool settings: scrub intervals"

This reverts commit 30810da4b573b3c7e679bc66eaa29b70246538cb.

After some discussion we have decided it is better to build a generic
dictionary in pg_pool_t to store infrequently used per-pool properties.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6083 from jcsp/wip-mds-allow-star
Gregory Farnum [Fri, 25 Sep 2015 15:40:51 +0000 (08:40 -0700)]
Merge pull request #6083 from jcsp/wip-mds-allow-star

ceph-create-keys: set mds "allow *"

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoceph-create-keys: set mds "allow *" 6083/head
John Spray [Fri, 25 Sep 2015 15:07:59 +0000 (16:07 +0100)]
ceph-create-keys: set mds "allow *"

So that 'tell' works out of the box.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5959 from mslovy/wip-current-dev
Kefu Chai [Fri, 25 Sep 2015 13:41:48 +0000 (21:41 +0800)]
Merge pull request #5959 from mslovy/wip-current-dev

mon: Fix unnecessary at/near max target warn in ceph -s

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5356 from majianpeng/code-cleanup
Kefu Chai [Fri, 25 Sep 2015 13:39:20 +0000 (21:39 +0800)]
Merge pull request #5356 from majianpeng/code-cleanup

osd: cleanup code when met crc error.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5972 from Jerry7X/master
Kefu Chai [Fri, 25 Sep 2015 13:31:38 +0000 (21:31 +0800)]
Merge pull request #5972 from Jerry7X/master

unsigned type is short for journal max_size,use uint64_t instead

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@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 agoObjecter: repeated free op->ontimeout. 6064/head
Ruifeng Yang [Fri, 25 Sep 2015 04:42:28 +0000 (12:42 +0800)]
Objecter: repeated free op->ontimeout.

repeated free op->ontimeout in SafeTimer::timer_thread::callback->complete

Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
9 years agoObjecter: maybe access wild pointer(op) in _op_submit_with_budget. 6078/head
Ruifeng Yang [Fri, 25 Sep 2015 02:18:11 +0000 (10:18 +0800)]
Objecter: maybe access wild pointer(op) in _op_submit_with_budget.

look at "after giving up session lock it can be freed at any time by response handler" in _op_submit,
so the _op_submit_with_budget::op maybe is wild after call _op_submit.

Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
9 years agoosd/ReplicatedPG: fix ENOSPC checking 6052/head
Sage Weil [Thu, 24 Sep 2015 23:27:16 +0000 (19:27 -0400)]
osd/ReplicatedPG: fix ENOSPC checking

1. We need to return ENOSPC *before* we apply our side-effects to the obc
cache in finish_ctx().

2. Consider object count changes too, not just bytes.

3. Consider cluster full flag, not just the pool flag.

4. Reply only if FULL_TRY; silently drop ops that were sent despite the
full flag.

Fixes: #13098
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/osd_types: remove [pool_]last_epoch_marked_full from OSDSuperblock
Sage Weil [Wed, 23 Sep 2015 14:19:46 +0000 (10:19 -0400)]
osd/osd_types: remove [pool_]last_epoch_marked_full from OSDSuperblock

This is no longer used or needed.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: remove buggy [pool_]last_map_marked_full tracking
Sage Weil [Wed, 23 Sep 2015 14:26:25 +0000 (10:26 -0400)]
osd: remove buggy [pool_]last_map_marked_full tracking

This is buggy (we reset the pool epoch each time it remains full instead
of only on the initial transition from non-full to full) and now unused.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: do full check in do_op
Sage Weil [Wed, 23 Sep 2015 14:25:30 +0000 (10:25 -0400)]
osd: do full check in do_op

1. The current pool_last_map_marked_full tracking is buggy.
2. We need to recheck this each time we consider the op, not just when it
is received off the wire.  Otherwise, we might get a message, queue it
for some reason, get a map indicating the cluster or pool is full, and
then requeue and process the op instead of discarding it.
3. For now, silently drop ops when failsafe check fails. This will lead to
stalled client IO.  This needs a more robust fix.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/PG: set last_epoch_marked_full on map advance
Sage Weil [Wed, 23 Sep 2015 14:14:47 +0000 (10:14 -0400)]
osd/PG: set last_epoch_marked_full on map advance

This will get persisted and shared.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/osd_types: add last_epoch_marked_full to pg_history_t
Sage Weil [Wed, 23 Sep 2015 14:01:35 +0000 (10:01 -0400)]
osd/osd_types: add last_epoch_marked_full to pg_history_t

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: set FULL_FORCE flag when honor_full is false
Sage Weil [Thu, 24 Sep 2015 23:02:21 +0000 (19:02 -0400)]
osdc/Objecter: set FULL_FORCE flag when honor_full is false

This currenty only applies to the MDS.  Eventually we can remove the
OSD MDS checks once we are confident all MDS instances are new enough
to set this flag.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: add FULL_TRY and FULL_FORCE rados op flags
Sage Weil [Thu, 24 Sep 2015 22:40:51 +0000 (18:40 -0400)]
osd: add FULL_TRY and FULL_FORCE rados op flags

FULL_TRY = try to do the op; ENOSPC if it results in a net increase is
space.  client must cope.

FULL_FORCE = do the op even if it consumes space.  The MDS will use this.
We should restrict this based on the OSD cap (* vs w, probably).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoqa: https://ceph.com/git -> https://git.ceph.com 6077/head
Sage Weil [Thu, 24 Sep 2015 22:36:57 +0000 (18:36 -0400)]
qa: https://ceph.com/git -> https://git.ceph.com

Signed-off-by: Sage Weil <sage@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 agoqa: http://ceph.com/qa -> http://download.ceph.com/qa
Sage Weil [Thu, 24 Sep 2015 22:10:46 +0000 (18:10 -0400)]
qa: http://ceph.com/qa -> http://download.ceph.com/qa

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/PG: compensate for sloppy hobject scrub bounds from hammer 6076/head
Sage Weil [Thu, 24 Sep 2015 15:38:41 +0000 (11:38 -0400)]
osd/PG: compensate for sloppy hobject scrub bounds from hammer

Hammer is sloppy about the hobject_t's it uses for the scrub bounds in that
the pool isn't set.  (Hammer FileStore doesn't care, but post-hammer is
much more careful about this sort of thing.)

Compensate by setting the pool on any scrub messages we receive.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: avoid duplicate MMonGetOSDMap requests 6075/head
Sage Weil [Thu, 24 Sep 2015 15:36:30 +0000 (11:36 -0400)]
osd: avoid duplicate MMonGetOSDMap requests

These are relatively expensive (we grab the full map from the mon) so we
should avoid duplicating our requests.

Track which requests are in flight.  Only send a new request when new
maps are asked for.  Resend requests when there is a new mon session.

Signed-off-by: Sage Weil <sage@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>