]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw_admin: new command to get bilog status
Yehuda Sadeh [Fri, 18 Mar 2016 22:15:47 +0000 (15:15 -0700)]
rgw_admin: new command to get bilog status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't record fetch remote obj in new multisite
Yehuda Sadeh [Fri, 18 Mar 2016 20:55:55 +0000 (13:55 -0700)]
rgw: don't record fetch remote obj in new multisite

No need to record the ops status in new multisite. It was used in v1
to record fetching remote objs during the operation, since these could
time out (were triggered by RESTful copy object that could take too long).
With v2 it can't time out, so no need to make it stateful.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't return error if can't find data sync status
Yehuda Sadeh [Thu, 17 Mar 2016 22:36:41 +0000 (15:36 -0700)]
rgw: don't return error if can't find data sync status

In that case, the default sync status is the one that will be used.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: log message cleanup
Yehuda Sadeh [Thu, 17 Mar 2016 22:36:21 +0000 (15:36 -0700)]
rgw: log message cleanup

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8167 from theanalyst/mstart/rgw_ports
Yehuda Sadeh [Thu, 17 Mar 2016 18:06:37 +0000 (11:06 -0700)]
Merge pull request #8167 from theanalyst/mstart/rgw_ports

mstart: start rgw on different ports as well

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3
Yehuda Sadeh [Thu, 17 Mar 2016 16:21:15 +0000 (09:21 -0700)]
Merge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3

Wip rgw sync fixes 3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8179 from zhjwpku/zhjwpku
Kefu Chai [Thu, 17 Mar 2016 10:14:41 +0000 (18:14 +0800)]
Merge pull request #8179 from zhjwpku/zhjwpku

doc/architecture.rst: remove redundant word "across"

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc/architecture.rst: remove redundant word "across" 8179/head
Zhao Junwang [Thu, 17 Mar 2016 09:34:51 +0000 (17:34 +0800)]
doc/architecture.rst: remove redundant word "across"

Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>
9 years agorgw: take a reference to the cr in async cr workers 8170/head
Yehuda Sadeh [Wed, 16 Mar 2016 22:34:46 +0000 (15:34 -0700)]
rgw: take a reference to the cr in async cr workers

and drop the cr when worker is done. The cr can be cleaned before
worker is done, so we should have it stick around as long as the
worker is alive.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: finalize reqs through a temporary set
Yehuda Sadeh [Wed, 16 Mar 2016 18:45:53 +0000 (11:45 -0700)]
rgw: finalize reqs through a temporary set

can't call _finish_request() on iter->second when iterating, it clobbers the
map.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: update data_log only when completing the op
Yehuda Sadeh [Wed, 16 Mar 2016 01:47:18 +0000 (18:47 -0700)]
rgw: update data_log only when completing the op

It doesn't make sense to update it earlier, the zone that follows will not sync before
it sees the completion.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8169 from ceph/wip-15041
Josh Durgin [Wed, 16 Mar 2016 22:04:56 +0000 (15:04 -0700)]
Merge pull request #8169 from ceph/wip-15041

doc: initial draft of RBD mirroring admin documentation

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc: initial draft of RBD mirroring admin documentation 8169/head
Jason Dillaman [Wed, 16 Mar 2016 18:10:55 +0000 (14:10 -0400)]
doc: initial draft of RBD mirroring admin documentation

Fixes: #15041
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8168 from linuxbox2/rgw-ldap-fixes
Yehuda Sadeh [Wed, 16 Mar 2016 20:41:06 +0000 (13:41 -0700)]
Merge pull request #8168 from linuxbox2/rgw-ldap-fixes

Rgw ldap fixes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw-ldap: conditional build 8168/head
Matt Benjamin [Wed, 16 Mar 2016 17:56:36 +0000 (13:56 -0400)]
rgw-ldap: conditional build

Permit building without LDAP support--support is enabled by default.
Tested with CMake and autotools standalone builds.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8165 from tchaikov/wip-fix-rgw-encoding
Kefu Chai [Wed, 16 Mar 2016 18:11:49 +0000 (02:11 +0800)]
Merge pull request #8165 from tchaikov/wip-fix-rgw-encoding

rgw/rgw_common.h: fix the RGWBucketInfo decoding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 16 Mar 2016 17:20:30 +0000 (13:20 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #8158 from dillaman/wip-rbd-mirror-fixes
Josh Durgin [Wed, 16 Mar 2016 16:41:04 +0000 (09:41 -0700)]
Merge pull request #8158 from dillaman/wip-rbd-mirror-fixes

rbd-mirror: fix image replay test failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agomstart: start rgw on different ports as well 8167/head
Abhishek Lekshmanan [Wed, 16 Mar 2016 16:20:30 +0000 (17:20 +0100)]
mstart: start rgw on different ports as well

similar to the way we set CEPH_PORT, set CEPH_RGW_PORT as well so that
we've rgw instances starting on different ports

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #8133 from ceph/wip-15145-cephfs-tools
branto1 [Wed, 16 Mar 2016 15:52:01 +0000 (16:52 +0100)]
Merge pull request #8133 from ceph/wip-15145-cephfs-tools

packaging: move cephfs repair tools to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agorgw/rgw_common.h: fix the RGWBucketInfo decoding 8165/head
Kefu Chai [Wed, 16 Mar 2016 15:39:48 +0000 (23:39 +0800)]
rgw/rgw_common.h: fix the RGWBucketInfo decoding

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8154 from tchaikov/wip-fix-rgw-decoding
Yehuda Sadeh [Wed, 16 Mar 2016 15:07:33 +0000 (08:07 -0700)]
Merge pull request #8154 from tchaikov/wip-fix-rgw-decoding

rgw/rgw_common.h: fix the RGWBucketInfo decoding

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoqa/workunits/rbd: rbd_mirror was extracting the incorrect image id 8158/head
Jason Dillaman [Wed, 16 Mar 2016 13:55:06 +0000 (09:55 -0400)]
qa/workunits/rbd: rbd_mirror was extracting the incorrect image id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: use unique logs for each rbd-mirror daemon
Jason Dillaman [Wed, 16 Mar 2016 13:16:51 +0000 (09:16 -0400)]
qa/workunits/rbd: use unique logs for each rbd-mirror daemon

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: refetch active object before defaulting to new tag
Jason Dillaman [Wed, 16 Mar 2016 12:33:03 +0000 (08:33 -0400)]
journal: refetch active object before defaulting to new tag

If a live replay is in progress, it's possible that object offset 0
was pulled and a new tag is discovered before the current object is
(re-)pulled to determine that the old tag still has entries remaining.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7894 from SUSE/wip-14828
Loic Dachary [Wed, 16 Mar 2016 13:10:15 +0000 (14:10 +0100)]
Merge pull request #7894 from SUSE/wip-14828

 ceph.spec.in: do not install Ceph RA on systemd platforms

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw/rgw_common.h: fix the RGWBucketInfo decoding 8154/head
Kefu Chai [Wed, 16 Mar 2016 12:41:16 +0000 (20:41 +0800)]
rgw/rgw_common.h: fix the RGWBucketInfo decoding

introduced by 416234b

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoceph.spec.in: Make ceph-common require libcephfs1 8133/head
Boris Ranto [Wed, 16 Mar 2016 11:13:24 +0000 (12:13 +0100)]
ceph.spec.in: Make ceph-common require libcephfs1

We recently moved fsck/repair tools to ceph-common package. We should
also make the version/release requirements tight.

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #8107 from liewegas/wip-crush
Kefu Chai [Wed, 16 Mar 2016 08:35:08 +0000 (16:35 +0800)]
Merge pull request #8107 from liewegas/wip-crush

crush: fix cli tests for new crush tunables

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8073 from ceph/wip-fsmap-upgrade-jewel
Gregory Farnum [Wed, 16 Mar 2016 05:34:50 +0000 (22:34 -0700)]
Merge pull request #8073 from ceph/wip-fsmap-upgrade-jewel

mds: fix FSMap upgrade with daemons in the map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8142 from tchaikov/wip-rgw-ftbfs
Yehuda Sadeh [Wed, 16 Mar 2016 03:53:27 +0000 (20:53 -0700)]
Merge pull request #8142 from tchaikov/wip-rgw-ftbfs

cls/rgw: fix FTBFS

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agocls/rgw: fix FTBFS 8142/head
Kefu Chai [Wed, 16 Mar 2016 03:46:51 +0000 (11:46 +0800)]
cls/rgw: fix FTBFS

BIVerObjEntry::mtime() is a method not a member variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8002 from rzarzynski/wip-rgw-putobjmeta
Yehuda Sadeh [Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)]
Merge pull request #8002 from rzarzynski/wip-rgw-putobjmeta

rgw: add support for metadata upload during PUT on Swift container.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8138 from dillaman/wip-15141
Josh Durgin [Wed, 16 Mar 2016 01:03:25 +0000 (18:03 -0700)]
Merge pull request #8138 from dillaman/wip-15141

rbd: add support for mirror image promotion/demotion/resync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8139 from yehudasa/wip-rgw-implicit-tenant
Yehuda Sadeh [Wed, 16 Mar 2016 00:44:24 +0000 (17:44 -0700)]
Merge pull request #8139 from yehudasa/wip-rgw-implicit-tenant

rgw: Allow an implicit tenant in case of Keystone

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agolibrbd: implement mirror image resync request API 8138/head
Jason Dillaman [Tue, 15 Mar 2016 20:34:26 +0000 (16:34 -0400)]
librbd: implement mirror image resync request API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track if a mirror image resync has been requested
Jason Dillaman [Tue, 15 Mar 2016 20:20:20 +0000 (16:20 -0400)]
librbd: track if a mirror image resync has been requested

A secondary image will store its resync request to the primary
image's journal. When the local rbd mirror process detects the
flag being set, it can initiate a resync from the remote.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: add placeholder for marking clients are disconnected
Jason Dillaman [Tue, 15 Mar 2016 19:50:31 +0000 (15:50 -0400)]
journal: add placeholder for marking clients are disconnected

When a client is disconnected from the journal, entries can be
pruned regardless of the affected client's commit position.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: initial implementation of mirror image promote/demote
Jason Dillaman [Tue, 15 Mar 2016 19:26:05 +0000 (15:26 -0400)]
librbd: initial implementation of mirror image promote/demote

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper methods for manipulating journal tags from API
Jason Dillaman [Tue, 15 Mar 2016 19:25:06 +0000 (15:25 -0400)]
librbd: helper methods for manipulating journal tags from API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: dump mirroring primary status on info command
Jason Dillaman [Tue, 15 Mar 2016 18:36:31 +0000 (14:36 -0400)]
rbd: dump mirroring primary status on info command

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: expose image mirroring primary/secondary status
Jason Dillaman [Tue, 15 Mar 2016 18:35:58 +0000 (14:35 -0400)]
librbd: expose image mirroring primary/secondary status

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: update rbd cli tests to incorporate new mirror image commands
Jason Dillaman [Tue, 15 Mar 2016 18:11:13 +0000 (14:11 -0400)]
test: update rbd cli tests to incorporate new mirror image commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: add mirror image promote/demote/resync commands
Jason Dillaman [Tue, 15 Mar 2016 18:10:46 +0000 (14:10 -0400)]
rbd: add mirror image promote/demote/resync commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stub API methods for mirror image promotion/demotion/resync
Jason Dillaman [Tue, 15 Mar 2016 17:55:07 +0000 (13:55 -0400)]
librbd: stub API methods for mirror image promotion/demotion/resync

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: Allow an implicit tenant in case of Keystone 8139/head
Pete Zaitcev [Wed, 9 Mar 2016 06:13:29 +0000 (23:13 -0700)]
rgw: Allow an implicit tenant in case of Keystone

This, unfortunately, introduces possible double lookups, but
they should be cached. Also, the logic appears somewhat convoluted,
although the intent is quite simple: if you're an OpenStack user
with a Keystone authentication, we allow an implicit tenant of
the same name as the user.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Conflicts:
src/rgw/rgw_swift.cc

9 years agoMerge pull request #8095 from yehudasa/wip-rgw-sync-fixes
Yehuda Sadeh [Tue, 15 Mar 2016 22:56:38 +0000 (15:56 -0700)]
Merge pull request #8095 from yehudasa/wip-rgw-sync-fixes

rgw sync fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: data shard sync doesn't exit on error 8095/head
Yehuda Sadeh [Tue, 15 Mar 2016 01:44:50 +0000 (18:44 -0700)]
rgw: data shard sync doesn't exit on error

We don't handle the error at the top level, so no
need to exit. Just continue with the backoff mechanism.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8108 from yehudasa/wip-rgw-highres-3
Matt Benjamin [Tue, 15 Mar 2016 22:37:19 +0000 (18:37 -0400)]
Merge pull request #8108 from yehudasa/wip-rgw-highres-3

Wip rgw highres 3

9 years agorgw ldap: s/memberattr/dnattr/;
Matt Benjamin [Tue, 15 Mar 2016 22:00:55 +0000 (18:00 -0400)]
rgw ldap: s/memberattr/dnattr/;

The parameter really is dnattr (attribute used to form DNs), not
memberattr (attribute used to form group member strings).

Switch to the correct name for this attribute, to avoid confusion--
especially if we ever apply group membership checks in future.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: propagate low time precision for user operations 8108/head
Yehuda Sadeh [Tue, 15 Mar 2016 21:22:06 +0000 (14:22 -0700)]
rgw: propagate low time precision for user operations

When user set a conditional timestamp to compare (e.g. if-modified-since),
it uses a low precision time resolution. Need to adjust checks for that.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: use higher precision time when encoding / decoding external apis
Yehuda Sadeh [Tue, 15 Mar 2016 20:31:31 +0000 (13:31 -0700)]
rgw: use higher precision time when encoding / decoding external apis

When dealing with external entities (e.g., remote rgw), use higher precision time
format for object mtime.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoutime: add gmtime_nsec()
Yehuda Sadeh [Tue, 15 Mar 2016 20:30:29 +0000 (13:30 -0700)]
utime: add gmtime_nsec()

higher precision than gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: extend date/time parsing
Yehuda Sadeh [Tue, 15 Mar 2016 20:29:48 +0000 (13:29 -0700)]
rgw: extend date/time parsing

So that we can parse correctly time encoded using utime_t::gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7631 from liewegas/wip-agent-flush-low
Samuel Just [Tue, 15 Mar 2016 19:58:48 +0000 (12:58 -0700)]
Merge pull request #7631 from liewegas/wip-agent-flush-low

osd: consider high/low mode when putting agent to sleep

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8040 from ukernel/jewel-15050
Gregory Farnum [Tue, 15 Mar 2016 19:27:36 +0000 (12:27 -0700)]
Merge pull request #8040 from ukernel/jewel-15050

mds: fix stray purging in 'stripe_count > 1' case

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7713 from ukernel/wip-filelock-deadlock
Gregory Farnum [Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)]
Merge pull request #7713 from ukernel/wip-filelock-deadlock

Wip filelock deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8136 from athanatos/wip-split-lfn
Sage Weil [Tue, 15 Mar 2016 18:16:22 +0000 (14:16 -0400)]
Merge pull request #8136 from athanatos/wip-split-lfn

osd: filestore: fix race condition with split vs collection_move_rename and long object names

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agopackaging: move cephfs repair tools to ceph-common
Ken Dreyer [Tue, 15 Mar 2016 17:10:56 +0000 (11:10 -0600)]
packaging: move cephfs repair tools to ceph-common

The CephFS repair tools are generally useful to run on any node, not
just the MDS nodes themselves.

Move the utilities from the ceph-mds package to the ceph-common package.

Fixes: #15145
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #8132 from dillaman/wip-librbd-memcheck
Josh Durgin [Tue, 15 Mar 2016 17:10:09 +0000 (10:10 -0700)]
Merge pull request #8132 from dillaman/wip-librbd-memcheck

librbd: correct issues discovered via valgrind memcheck

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agojournal: reschedule watch if no entries available during live replay 8132/head
Jason Dillaman [Tue, 15 Mar 2016 16:39:10 +0000 (12:39 -0400)]
journal: reschedule watch if no entries available during live replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: correct valgrind memcheck errors
Jason Dillaman [Tue, 15 Mar 2016 16:27:04 +0000 (12:27 -0400)]
librbd: correct valgrind memcheck errors

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8120 from SUSE/wip-15138
Ken Dreyer [Tue, 15 Mar 2016 15:24:19 +0000 (09:24 -0600)]
Merge pull request #8120 from SUSE/wip-15138

RPM: fix openldap and openssl build dependencies for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
9 years agoMerge pull request #8114 from liewegas/wip-tmap-migrate
Sage Weil [Tue, 15 Mar 2016 15:21:12 +0000 (11:21 -0400)]
Merge pull request #8114 from liewegas/wip-tmap-migrate

qa/workunits/rados/test.sh: test tmap_migrate

9 years agoMerge pull request #8119 from dillaman/wip-qa-rbd-copy
Josh Durgin [Tue, 15 Mar 2016 15:21:05 +0000 (08:21 -0700)]
Merge pull request #8119 from dillaman/wip-qa-rbd-copy

rbd: clone operation should default to image format 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8090 from trociny/fixup-rbd-mirror-test
Josh Durgin [Tue, 15 Mar 2016 15:20:43 +0000 (08:20 -0700)]
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>
9 years agoMerge pull request #8128 from jcsp/wip-15135
Sage Weil [Tue, 15 Mar 2016 15:20:30 +0000 (11:20 -0400)]
Merge pull request #8128 from jcsp/wip-15135

tools/cephfs: fix tmap_upgrade

9 years agoMerge pull request #8129 from dillaman/wip-qa-rbd-permissions
Josh Durgin [Tue, 15 Mar 2016 15:18:25 +0000 (08:18 -0700)]
Merge pull request #8129 from dillaman/wip-qa-rbd-permissions

test: fix issues discovered via the rbd permissions test case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8124 from dillaman/wip-qa-rbd-lock-fence
Josh Durgin [Tue, 15 Mar 2016 15:17:21 +0000 (08:17 -0700)]
Merge pull request #8124 from dillaman/wip-qa-rbd-lock-fence

test: handle exception thrown from close during rbd lock test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: disable deep-flatten during permissions testing 8129/head
Jason Dillaman [Tue, 15 Mar 2016 14:58:08 +0000 (10:58 -0400)]
qa/workunits/rbd: disable deep-flatten during permissions testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotools/cephfs: fix tmap_upgrade 8128/head
John Spray [Tue, 15 Mar 2016 14:58:27 +0000 (14:58 +0000)]
tools/cephfs: fix tmap_upgrade

Move it up to handle the command before we try
and initialize DataScan::driver, because drivers
require a target filesystem, and that doesn't
apply to this command.

Fixes: #15135
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agorbd: snap list should open image as read-only
Jason Dillaman [Tue, 15 Mar 2016 14:57:48 +0000 (10:57 -0400)]
rbd: snap list should open image as read-only

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Tue, 15 Mar 2016 14:44:15 +0000 (10:44 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7243 from tchaikov/wip-py3-jewel
Sage Weil [Tue, 15 Mar 2016 14:48:41 +0000 (10:48 -0400)]
Merge pull request #7243 from tchaikov/wip-py3-jewel

ceph-detect-init: fix py3 test

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7975 from JiYou/fix-config-opts
Kefu Chai [Tue, 15 Mar 2016 14:17:57 +0000 (22:17 +0800)]
Merge pull request #7975 from JiYou/fix-config-opts

config: fix osd_crush_initial_weight

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8125 from dillaman/wip-librbd-mock
Sage Weil [Tue, 15 Mar 2016 14:17:03 +0000 (10:17 -0400)]
Merge pull request #8125 from dillaman/wip-librbd-mock

test: add missing shut_down mock method

9 years agotest: add missing shut_down mock method 8125/head
Jason Dillaman [Tue, 15 Mar 2016 14:10:41 +0000 (10:10 -0400)]
test: add missing shut_down mock method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: handle exception thrown from close during lock test 8124/head
Jason Dillaman [Tue, 15 Mar 2016 13:57:37 +0000 (09:57 -0400)]
qa/workunits/rbd: handle exception thrown from close during lock test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRPM: fix openldap and openssl build dependencies for SUSE 8120/head
Nathan Cutler [Tue, 15 Mar 2016 13:46:54 +0000 (14:46 +0100)]
RPM: fix openldap and openssl build dependencies for SUSE

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorbd: clone operation should default to image format 2 8119/head
Jason Dillaman [Tue, 15 Mar 2016 13:45:21 +0000 (09:45 -0400)]
rbd: clone operation should default to image format 2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8116 from SUSE/wip-docdev-nuke
Loic Dachary [Tue, 15 Mar 2016 13:25:38 +0000 (14:25 +0100)]
Merge pull request #8116 from SUSE/wip-docdev-nuke

doc/dev: add section on interrupting a running suite

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMDSMonitor: check for duplicated fs creation *before* multiple-fs creation 8073/head
Greg Farnum [Fri, 11 Mar 2016 22:30:53 +0000 (14:30 -0800)]
MDSMonitor: check for duplicated fs creation *before* multiple-fs creation

If we check for creating an FS with one already existing first, we will
reject (with EINVAL) duplicate attempts to create the same FS with
the same params. That makes it non-idempotent, which is bad!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc/dev: add section on interrupting a running suite 8116/head
Nathan Cutler [Tue, 15 Mar 2016 13:10:42 +0000 (14:10 +0100)]
doc/dev: add section on interrupting a running suite

This commit adds a new section, entitled "Interrupt a running suite", to
the "Testing in the cloud" chapter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8105 from SUSE/wip-ceph-detect-init-tox
Sage Weil [Tue, 15 Mar 2016 13:12:24 +0000 (09:12 -0400)]
Merge pull request #8105 from SUSE/wip-ceph-detect-init-tox

ceph-detect-init: add missing test case

9 years agoMerge pull request #8088 from liewegas/wip-typo
Sage Weil [Tue, 15 Mar 2016 13:08:55 +0000 (09:08 -0400)]
Merge pull request #8088 from liewegas/wip-typo

osd/OSDMap: fix typo in summarize_mapping_stats

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8098 from liewegas/wip-fix-crush
Sage Weil [Tue, 15 Mar 2016 13:00:33 +0000 (09:00 -0400)]
Merge pull request #8098 from liewegas/wip-fix-crush

unittest_osdmap: default crush tunables now firefly

9 years agoMerge pull request #8089 from liewegas/wip-mark-pg-stale
Sage Weil [Tue, 15 Mar 2016 13:00:06 +0000 (09:00 -0400)]
Merge pull request #8089 from liewegas/wip-mark-pg-stale

mon/PGMonitor: reliably mark PGs state

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7943 from llua/init-ceph
Sage Weil [Tue, 15 Mar 2016 12:52:30 +0000 (08:52 -0400)]
Merge pull request #7943 from llua/init-ceph

init-ceph.in: allow case-insensitive true in `osd crush update on start'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #8055 from liewegas/wip-hobject
Sage Weil [Tue, 15 Mar 2016 12:40:14 +0000 (08:40 -0400)]
Merge pull request #8055 from liewegas/wip-hobject

ghobject_t: use # instead of ! as a separator

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #8056 from rjfd/wip-13296
Jason Dillaman [Tue, 15 Mar 2016 12:39:44 +0000 (08:39 -0400)]
Merge pull request #8056 from rjfd/wip-13296

rbd: support for enabling/disabling mirroring on specific images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rados/test.sh: test tmap_migrate 8114/head
Sage Weil [Mon, 14 Mar 2016 17:11:59 +0000 (13:11 -0400)]
qa/workunits/rados/test.sh: test tmap_migrate

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7971 from ceph/wip-selinux-update
Sage Weil [Tue, 15 Mar 2016 12:38:01 +0000 (08:38 -0400)]
Merge pull request #7971 from ceph/wip-selinux-update

selinux: Update policy to grant additional access

9 years agoMerge pull request #8033 from liewegas/wip-pg-create
Sage Weil [Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)]
Merge pull request #8033 from liewegas/wip-pg-create

osd: handle dup pg_create that races with pg deletion

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8054 from ErwanAliasr1/evelu-check
Sage Weil [Tue, 15 Mar 2016 12:35:06 +0000 (08:35 -0400)]
Merge pull request #8054 from ErwanAliasr1/evelu-check

common: SubProcess: Avoid buffer corruption when calling err()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8057 from liewegas/wip-pglog-warning
Sage Weil [Tue, 15 Mar 2016 12:34:29 +0000 (08:34 -0400)]
Merge pull request #8057 from liewegas/wip-pglog-warning

osd/PGLog: fix warning

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8059 from ceph/wip-include-scope
Sage Weil [Tue, 15 Mar 2016 12:34:09 +0000 (08:34 -0400)]
Merge pull request #8059 from ceph/wip-include-scope

rados: add ceph:: namespace to bufferlist type

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8071 from xiexingguo/xxg-wip-fixptr
Sage Weil [Tue, 15 Mar 2016 12:33:42 +0000 (08:33 -0400)]
Merge pull request #8071 from xiexingguo/xxg-wip-fixptr

osd: initialize last_recalibrate field at construction

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset
Sage Weil [Tue, 15 Mar 2016 12:33:13 +0000 (08:33 -0400)]
Merge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset

osd: min_write_recency_for_promote & min_read_recency_for_promote are tiering only

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest: fixup and improvements for rbd-mirror test 8090/head
Mykola Golub [Mon, 14 Mar 2016 14:47:04 +0000 (16:47 +0200)]
test: fixup and improvements for rbd-mirror test

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api
Kefu Chai [Tue, 15 Mar 2016 06:44:24 +0000 (14:44 +0800)]
Merge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api

doc/rados/api/librados-intro.rst: fix typo

Reviewed-by: Kefu Chai <tchaikov@gmail.com>