]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoclient: properly trim unlinked inode 7297/head
Yan, Zheng [Wed, 20 Jan 2016 14:22:01 +0000 (22:22 +0800)]
client: properly trim unlinked inode

Client should trim inode from its cache when receiving a cap message
with nlink == 0. But the corresponding code has a bug, it does nothing
when inode's nlink is already 0.

Fixes: #13903
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7246 from ukernel/jewel-14377
Gregory Farnum [Wed, 20 Jan 2016 02:24:34 +0000 (18:24 -0800)]
Merge pull request #7246 from ukernel/jewel-14377

ceph_test_libcephfs: tolerate duplicated entries in readdir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7209 from ukernel/jewel-11517
Gregory Farnum [Wed, 20 Jan 2016 02:17:23 +0000 (18:17 -0800)]
Merge pull request #7209 from ukernel/jewel-11517

client: check if Fh is readable when processing a read

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7199 from ukernel/jewel-14254
Gregory Farnum [Wed, 20 Jan 2016 02:13:58 +0000 (18:13 -0800)]
Merge pull request #7199 from ukernel/jewel-14254

mds: fix client cap/message replay order on restart

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7274 from dillaman/wip-helgrind-race-jewel
Josh Durgin [Tue, 19 Jan 2016 11:47:16 +0000 (06:47 -0500)]
Merge pull request #7274 from dillaman/wip-helgrind-race-jewel

helgrind: additional race conditionslibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: missing lock on state transition 7274/head
Jason Dillaman [Mon, 18 Jan 2016 22:53:00 +0000 (17:53 -0500)]
librbd: missing lock on state transition

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agohelgrind: annotate false-positive race conditions
Jason Dillaman [Mon, 18 Jan 2016 22:52:51 +0000 (17:52 -0500)]
helgrind: annotate false-positive race conditions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7272 from dillaman/wip-14385-jewel
Josh Durgin [Mon, 18 Jan 2016 22:30:48 +0000 (17:30 -0500)]
Merge pull request #7272 from dillaman/wip-14385-jewel

qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOSlibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS 7272/head
Jason Dillaman [Mon, 18 Jan 2016 20:57:43 +0000 (15:57 -0500)]
qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS

Fixes: #14385
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoceph_test_libcephfs: tolerate duplicated entries in readdir 7246/head
Yan, Zheng [Fri, 15 Jan 2016 09:15:16 +0000 (17:15 +0800)]
ceph_test_libcephfs: tolerate duplicated entries in readdir

If a dirfrag get fragmented in the middle of readdir, the readdir
result may contain duplicated entries. (but there shouldn't be
any missing entries)

Fixes: #14377
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: add config option to suspend logging 7199/head
Yan, Zheng [Fri, 15 Jan 2016 05:33:21 +0000 (13:33 +0800)]
mds: add config option to suspend logging

The option creates long-standing unsafe MDS requests. It help in
testing unsafe request related corner cases.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: fix completed cap flush handling
Yan, Zheng [Wed, 13 Jan 2016 14:00:53 +0000 (22:00 +0800)]
mds: fix completed cap flush handling

Client re-send cap flush when MDS restarts. The cap flush message
may release some caps even if the corresponding flush is already
completed.

Fixes: #13546
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: delay handling client caps until corresponding inode is created
Yan, Zheng [Tue, 12 Jan 2016 08:54:14 +0000 (16:54 +0800)]
mds: delay handling client caps until corresponding inode is created

When handling client caps in clientreplay stage, it's possible that
corresponding inode does not exist because the client request which
creates inode hasn't been replayed. To handle this corner case, we
delay handling caps message until corresponding inode is created.

Fixes: #14254
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoceph_test_libcephfs: check file open mode 7209/head
Yan, Zheng [Thu, 14 Jan 2016 04:01:51 +0000 (12:01 +0800)]
ceph_test_libcephfs: check file open mode

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoclient: check if Fh is readable before read
Yan, Zheng [Wed, 13 Jan 2016 07:55:02 +0000 (15:55 +0800)]
client: check if Fh is readable before read

Fixes: #11517
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7220 from dillaman/wip-13810-jewel
Josh Durgin [Thu, 14 Jan 2016 01:07:27 +0000 (17:07 -0800)]
Merge pull request #7220 from dillaman/wip-13810-jewel

tests: notification slave needs to wait for master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7208 from dillaman/wip-14163-jewel
Josh Durgin [Thu, 14 Jan 2016 00:56:29 +0000 (16:56 -0800)]
Merge pull request #7208 from dillaman/wip-14163-jewel

helgrind: fix real (and imaginary) race conditions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: notification slave needs to wait for master 7220/head
Jason Dillaman [Wed, 13 Jan 2016 17:44:01 +0000 (12:44 -0500)]
tests: notification slave needs to wait for master

If the slave instance starts before the master, race
conditions are possible.

Fixes: #13810
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: log write/discard errors from clip operation
Jason Dillaman [Wed, 13 Jan 2016 17:42:05 +0000 (12:42 -0500)]
librbd: log write/discard errors from clip operation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years ago10.0.2 v10.0.2
Jenkins Build Slave User [Wed, 13 Jan 2016 16:22:27 +0000 (16:22 +0000)]
10.0.2

9 years agoosdc: hold rwlock when updating crush location config 7208/head
Jason Dillaman [Wed, 13 Jan 2016 14:53:29 +0000 (09:53 -0500)]
osdc: hold rwlock when updating crush location config

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomsg/simple: destroy spinlock in destructor
Jason Dillaman [Tue, 12 Jan 2016 14:50:25 +0000 (09:50 -0500)]
msg/simple: destroy spinlock in destructor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoosdc: hold writer lock when updating session ops
Jason Dillaman [Mon, 11 Jan 2016 14:50:15 +0000 (09:50 -0500)]
osdc: hold writer lock when updating session ops

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: hold lock while testing state variable
Jason Dillaman [Wed, 13 Jan 2016 01:35:06 +0000 (20:35 -0500)]
librados: hold lock while testing state variable

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoconfig: avoid re-entrant locking on observer callback
Jason Dillaman [Wed, 13 Jan 2016 01:34:41 +0000 (20:34 -0500)]
config: avoid re-entrant locking on observer callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoWorkQueue: delay registering PointerWQ with thread pool
Jason Dillaman [Wed, 13 Jan 2016 01:33:22 +0000 (20:33 -0500)]
WorkQueue: delay registering PointerWQ with thread pool

Derived classes should be responsible for registration to avoid
accessing a partially constructed object.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agohelgrind: suppress race conditions in external libraries
Jason Dillaman [Wed, 13 Jan 2016 01:32:35 +0000 (20:32 -0500)]
helgrind: suppress race conditions in external libraries

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agohelgrind: annotate false-positive race conditions
Jason Dillaman [Fri, 8 Jan 2016 17:34:45 +0000 (12:34 -0500)]
helgrind: annotate false-positive race conditions

Fixes: #14163
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agodeb,rpm: add valgrind to build dependencies
Jason Dillaman [Fri, 8 Jan 2016 17:21:58 +0000 (12:21 -0500)]
deb,rpm: add valgrind to build dependencies

Provides necessary support for annotating helgrind
false-positives.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomds: fix flushing caps check
Yan, Zheng [Mon, 11 Jan 2016 12:51:17 +0000 (20:51 +0800)]
mds: fix flushing caps check

Client may flush and drop caps at the same time. If client need to
send cap reconnect before the caps get flushed. The issued caps in
the cap reconnect does not include the flushing caps. When choosing
lock states we should consider the flushing caps.

The check for caps haven't been flushed is wrong, fix it.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoclient: avoid re-sending cap flushes twice during MDS recovers
Yan, Zheng [Tue, 12 Jan 2016 09:04:59 +0000 (17:04 +0800)]
client: avoid re-sending cap flushes twice during MDS recovers

During MDS recovers, client may send same cap flushes twice. The
first time is when MDS enters reconnect stage (only for flushing
caps which are also revoked), the second time is when MDS goes
active. If we send cap flushes when enters reconnect stage, we
should avoiding sending again.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7204 from dillaman/wip-14308-jewel
Josh Durgin [Wed, 13 Jan 2016 04:00:06 +0000 (20:00 -0800)]
Merge pull request #7204 from dillaman/wip-14308-jewel

librbd: better handling of exclusive lock transition period

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7205 from ceph/wip-python-dev-dep
Alfredo Deza [Tue, 12 Jan 2016 22:22:15 +0000 (17:22 -0500)]
Merge pull request #7205 from ceph/wip-python-dev-dep

packaging: add build dependency on python devel package

Reviewed-by: Alfredo Deza <adeza@redhat.com>
9 years agopackaging: add build dependency on python devel package 7205/head
Josh Durgin [Tue, 12 Jan 2016 19:12:28 +0000 (11:12 -0800)]
packaging: add build dependency on python devel package

This is required for building python modules with cython, but for some
reason is not a direct dependency (on debian only a recommends) for
the cython package itself.

Refs: #14059
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: add additional granularity to lock states 7204/head
Jason Dillaman [Tue, 12 Jan 2016 18:00:34 +0000 (13:00 -0500)]
librbd: add additional granularity to lock states

Allow all pre-release actions to see that the exclusive lock is
still owned and all post-acquire actions to see that the exclusive
lock is now owned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: initialize object map before replaying journal
Jason Dillaman [Tue, 12 Jan 2016 16:56:24 +0000 (11:56 -0500)]
librbd: initialize object map before replaying journal

The journal might replay write events which will need to update the
object map.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: do not accept RPC requests while transitioning lock state
Jason Dillaman [Tue, 12 Jan 2016 15:35:05 +0000 (10:35 -0500)]
librbd: do not accept RPC requests while transitioning lock state

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: avoid error message when peer owns exclusive lock
Jason Dillaman [Tue, 12 Jan 2016 15:15:09 +0000 (10:15 -0500)]
librbd: avoid error message when peer owns exclusive lock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7147 from athanatos/wip-14247
Samuel Just [Fri, 8 Jan 2016 19:41:55 +0000 (11:41 -0800)]
Merge pull request #7147 from athanatos/wip-14247

Wip 14247

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7148 from athanatos/wip-14248
Samuel Just [Fri, 8 Jan 2016 19:39:16 +0000 (11:39 -0800)]
Merge pull request #7148 from athanatos/wip-14248

OpRequest: release the message throttle when unregistered

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6801 from athanatos/wip-13965
Samuel Just [Fri, 8 Jan 2016 19:37:56 +0000 (11:37 -0800)]
Merge pull request #6801 from athanatos/wip-13965

Wip 13965

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7143 from dillaman/wip-librbd-rename-request
Josh Durgin [Thu, 7 Jan 2016 16:53:14 +0000 (08:53 -0800)]
Merge pull request #7143 from dillaman/wip-librbd-rename-request

librbd: correct include guard in RenameRequest.h

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: correct include guard in RenameRequest.h 7143/head
Jason Dillaman [Thu, 7 Jan 2016 13:52:40 +0000 (08:52 -0500)]
librbd: correct include guard in RenameRequest.h

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7129 from dillaman/wip-14167-jewel
Josh Durgin [Thu, 7 Jan 2016 00:18:33 +0000 (16:18 -0800)]
Merge pull request #7129 from dillaman/wip-14167-jewel

librbd: disable copy-on-read when not exclusive lock owner

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge branch 'wip-14241-jewel' of git://github.com/dillaman/ceph into jewel
Josh Durgin [Wed, 6 Jan 2016 23:34:50 +0000 (15:34 -0800)]
Merge branch 'wip-14241-jewel' of git://github.com/dillaman/ceph into jewel

librbd: don't use write_full optimization with clones

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge branch 'wip-client-readdir-fix' of git://github.com/ukernel/ceph into jewel
Greg Farnum [Wed, 6 Jan 2016 21:31:39 +0000 (13:31 -0800)]
Merge branch 'wip-client-readdir-fix' of git://github.com/ukernel/ceph into jewel

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agolibrbd: disable write_full optimization if image has parent 7133/head
Jason Dillaman [Wed, 6 Jan 2016 19:55:02 +0000 (14:55 -0500)]
librbd: disable write_full optimization if image has parent

Fixes: #14241
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: new test case for write_full optimization
Jason Dillaman [Wed, 6 Jan 2016 19:12:43 +0000 (14:12 -0500)]
tests: new test case for write_full optimization

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: directly execute copy-on-read copyup operations 7129/head
Jason Dillaman [Wed, 6 Jan 2016 15:02:52 +0000 (10:02 -0500)]
librbd: directly execute copy-on-read copyup operations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoOSD::ScrubJob: correctly handle small osd_scrub_interval_randomize_ratio 7147/head
Samuel Just [Tue, 5 Jan 2016 23:23:01 +0000 (15:23 -0800)]
OSD::ScrubJob: correctly handle small osd_scrub_interval_randomize_ratio

utime_t &operator+=(utime_t, double) exists, let's just use that and
not muck about with converting the double to an int.

Fixes: 14247
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoRevert "osd: fix arithmetic exception when scrub_min_interval is small"
Samuel Just [Tue, 5 Jan 2016 23:18:33 +0000 (15:18 -0800)]
Revert "osd: fix arithmetic exception when scrub_min_interval is small"

This reverts commit a828a4df54f040a39f54c4cdecde234376301be5.

9 years agoOpRequest: release the message throttle when unregistered 7148/head
Samuel Just [Wed, 6 Jan 2016 00:24:15 +0000 (16:24 -0800)]
OpRequest: release the message throttle when unregistered

We don't want messages in the OpTracker history hanging on to
message throttle.

Fixes: #14248
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agolibrbd: disable copy-on-read when not exclusive lock owner
Jason Dillaman [Tue, 5 Jan 2016 21:32:41 +0000 (16:32 -0500)]
librbd: disable copy-on-read when not exclusive lock owner

Fixes: #14167
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: fsx should disable journaling feature for krbd
Jason Dillaman [Tue, 5 Jan 2016 19:33:55 +0000 (14:33 -0500)]
tests: fsx should disable journaling feature for krbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7114 from dillaman/wip-14234-jewel
Josh Durgin [Tue, 5 Jan 2016 19:41:00 +0000 (11:41 -0800)]
Merge pull request #7114 from dillaman/wip-14234-jewel

librbd: reduce verbosity of common error condition logging

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge branch 'wip-14237-jewel' of git://github.com/dillaman/ceph into jewel
Josh Durgin [Tue, 5 Jan 2016 19:39:12 +0000 (11:39 -0800)]
Merge branch 'wip-14237-jewel' of git://github.com/dillaman/ceph into jewel

qa/workunits/rbd: import_export should use clean temp space

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7113 from dillaman/wip-14168-jewel
Josh Durgin [Tue, 5 Jan 2016 18:30:26 +0000 (10:30 -0800)]
Merge pull request #7113 from dillaman/wip-14168-jewel

journal: disconnect watch after watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: import_export should use clean temp space 7115/head
Jason Dillaman [Tue, 5 Jan 2016 17:48:37 +0000 (12:48 -0500)]
qa/workunits/rbd: import_export should use clean temp space

Fixes: #14237
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: reduce verbosity of common error condition logging 7114/head
Jason Dillaman [Tue, 5 Jan 2016 17:29:13 +0000 (12:29 -0500)]
librbd: reduce verbosity of common error condition logging

Fixes: #14234
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: disconnect watch after watch error 7113/head
Jason Dillaman [Tue, 5 Jan 2016 04:13:16 +0000 (23:13 -0500)]
journal: disconnect watch after watch error

Fixes: #14168
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRevert "rgw: use smart pointer for C_Reinitwatch"
Yehuda Sadeh [Mon, 4 Jan 2016 20:54:33 +0000 (12:54 -0800)]
Revert "rgw: use smart pointer for C_Reinitwatch"

This commit introduced regressions, issues #14173, #14180.

The problem is that the context deletes itself after execution,
so using a shared_ptr to hold it is problematic, as we'll eventually
have a double free. Also, it doesn't solve the underlying leak issue.

This reverts commit e9daed221e7c6fd84aef78c3d5fc18470b916fcb.

9 years agoMerge pull request #7101 from dillaman/wip-14221-jewel
Josh Durgin [Mon, 4 Jan 2016 20:46:47 +0000 (15:46 -0500)]
Merge pull request #7101 from dillaman/wip-14221-jewel

qa/workunits/rbd: rbd-nbd test should use sudo for map/unmap ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: rbd-nbd test should use sudo for map/unmap ops 7101/head
Jason Dillaman [Mon, 4 Jan 2016 16:21:24 +0000 (11:21 -0500)]
qa/workunits/rbd: rbd-nbd test should use sudo for map/unmap ops

Fixes: #14221
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6933 from jcsp/wip-14048
Yan, Zheng [Thu, 24 Dec 2015 08:27:28 +0000 (16:27 +0800)]
Merge pull request #6933 from jcsp/wip-14048

mds: tear down connections from `tell` commands

9 years agoMerge pull request #7043 from dillaman/wip-14170-jewel
Josh Durgin [Wed, 23 Dec 2015 21:30:13 +0000 (13:30 -0800)]
Merge pull request #7043 from dillaman/wip-14170-jewel

librbd: do not ignore self-managed snapshot release result

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: do not ignore self-managed snapshot release result 7043/head
Jason Dillaman [Wed, 23 Dec 2015 18:57:44 +0000 (13:57 -0500)]
librbd: do not ignore self-managed snapshot release result

Fixes: #14170
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7042 from dillaman/wip-14164-jewel
Josh Durgin [Wed, 23 Dec 2015 18:52:16 +0000 (10:52 -0800)]
Merge pull request #7042 from dillaman/wip-14164-jewel

librbd: properly handle replay of snap remove RPC message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7040 from dillaman/wip-14092-jewel
Josh Durgin [Wed, 23 Dec 2015 18:48:43 +0000 (10:48 -0800)]
Merge pull request #7040 from dillaman/wip-14092-jewel

librbd: ensure librados callbacks are flushed prior to destroying

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7035 from dillaman/wip-14122-jewel
Josh Durgin [Wed, 23 Dec 2015 18:43:29 +0000 (10:43 -0800)]
Merge pull request #7035 from dillaman/wip-14122-jewel

librbd: clear error when older OSD doesn't support image flags

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: properly handle replay of snap remove RPC message 7042/head
Jason Dillaman [Wed, 23 Dec 2015 18:26:39 +0000 (13:26 -0500)]
librbd: properly handle replay of snap remove RPC message

Fixes: #14164
Backport: infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: ensure librados callbacks are flushed prior to destroying image 7040/head
Jason Dillaman [Wed, 23 Dec 2015 17:06:50 +0000 (12:06 -0500)]
librbd: ensure librados callbacks are flushed prior to destroying image

Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: clear error when older OSD doesn't support image flags 7035/head
Jason Dillaman [Wed, 23 Dec 2015 14:41:32 +0000 (09:41 -0500)]
librbd: clear error when older OSD doesn't support image flags

Fixes: #14122
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7002 from dillaman/wip-14092-jewel
Josh Durgin [Mon, 21 Dec 2015 15:31:57 +0000 (07:31 -0800)]
Merge pull request #7002 from dillaman/wip-14092-jewel

tests: flush op work queue prior to destroying MockImageCtx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: flush op work queue prior to destroying MockImageCtx 7002/head
Jason Dillaman [Mon, 21 Dec 2015 14:03:15 +0000 (09:03 -0500)]
tests: flush op work queue prior to destroying MockImageCtx

Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6815 from badone/wip-13993
Sage Weil [Sat, 19 Dec 2015 18:58:37 +0000 (13:58 -0500)]
Merge pull request #6815 from badone/wip-13993

common: log: Assign LOG_DEBUG priority to syslog calls

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6979 from dillaman/wip-14123-jewel
Josh Durgin [Fri, 18 Dec 2015 21:25:35 +0000 (13:25 -0800)]
Merge pull request #6979 from dillaman/wip-14123-jewel

librbd: correct issues discovered when cache is disabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6974 from dillaman/wip-14108-jewel
Josh Durgin [Fri, 18 Dec 2015 21:13:44 +0000 (13:13 -0800)]
Merge pull request #6974 from dillaman/wip-14108-jewel

librbd: correct issues discovered during teuthology testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: skip journal event if write/discard was no-op 6979/head
Jason Dillaman [Fri, 18 Dec 2015 20:14:34 +0000 (15:14 -0500)]
librbd: skip journal event if write/discard was no-op

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: object map ENOENT optimizations should complete asynchronously
Jason Dillaman [Fri, 18 Dec 2015 20:12:23 +0000 (15:12 -0500)]
librbd: object map ENOENT optimizations should complete asynchronously

This ensures a consistent lock ordering between the optimized path and
a librados callback. Remove the cache writebach handler's custom finisher
and re-use the op_work_queue.

Fixes: #14123
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: update exclusive lock state when shutting down 6974/head
Jason Dillaman [Fri, 18 Dec 2015 19:15:10 +0000 (14:15 -0500)]
librbd: update exclusive lock state when shutting down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: extra request required if journal enabled w/ caching
Jason Dillaman [Fri, 18 Dec 2015 18:14:58 +0000 (13:14 -0500)]
librbd: extra request required if journal enabled w/ caching

Fixes: #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stop the copyup thread during shutdown
Jason Dillaman [Fri, 18 Dec 2015 18:04:20 +0000 (13:04 -0500)]
librbd: stop the copyup thread during shutdown

Fixes: #14107, #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6972 from dillaman/wip-14106-jewel
Josh Durgin [Fri, 18 Dec 2015 16:46:55 +0000 (08:46 -0800)]
Merge pull request #6972 from dillaman/wip-14106-jewel

rbd: merge_diff test should use new --object-size parameter instead of --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: use --object-size instead of --order 6972/head
Jason Dillaman [Fri, 18 Dec 2015 08:03:20 +0000 (03:03 -0500)]
qa/workunits/rbd: use --object-size instead of --order

Fixes: #14106
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: process crushed, rbd creating with striping parameters
na xie [Tue, 15 Dec 2015 13:28:34 +0000 (21:28 +0800)]
rbd: process crushed, rbd creating with striping parameters

Signed-off-by: Na Xie <xie.na@h3c.com>
10 years agolog: Log.cc: Assign LOG_DEBUG priority to syslog calls 6815/head
Brad Hubbard [Mon, 7 Dec 2015 01:31:28 +0000 (11:31 +1000)]
log: Log.cc: Assign LOG_DEBUG priority to syslog calls

Fixes: #13993
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
10 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 16 Dec 2015 15:48:15 +0000 (10:48 -0500)]
Merge remote-tracking branch 'gh/jewel'

10 years agoMerge pull request #6932 from aiicore/test_fix
Sage Weil [Wed, 16 Dec 2015 13:46:50 +0000 (08:46 -0500)]
Merge pull request #6932 from aiicore/test_fix

tests: allow object corpus readable test to skip specific incompat instances

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #6941 from jcsp/wip-14029
Yan, Zheng [Wed, 16 Dec 2015 11:55:40 +0000 (19:55 +0800)]
Merge pull request #6941 from jcsp/wip-14029

mds: fix setvxattr (broken in a536d114)

10 years agoMerge pull request #6948 from ceph/revert-6939-bp-remove-bz2dev
David Zafman [Wed, 16 Dec 2015 01:47:01 +0000 (17:47 -0800)]
Merge pull request #6948 from ceph/revert-6939-bp-remove-bz2dev

Revert "makefiles: remove bz2-dev from dependencies"

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoRevert "makefiles: remove bz2-dev from dependencies" 6948/head
Samuel Just [Tue, 15 Dec 2015 23:12:19 +0000 (15:12 -0800)]
Revert "makefiles: remove bz2-dev from dependencies"

10 years agoMerge pull request #6692 from SUSE/wip-13860
Ken Dreyer [Tue, 15 Dec 2015 15:27:58 +0000 (08:27 -0700)]
Merge pull request #6692 from SUSE/wip-13860

ceph.spec.in: add BuildRequires: systemd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #6939 from branch-predictor/bp-remove-bz2dev
Kefu Chai [Tue, 15 Dec 2015 14:43:27 +0000 (22:43 +0800)]
Merge pull request #6939 from branch-predictor/bp-remove-bz2dev

makefiles: remove bz2-dev from dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #6943 from smithfarm/wip-doc-dev-typo
Loic Dachary [Tue, 15 Dec 2015 14:33:21 +0000 (15:33 +0100)]
Merge pull request #6943 from smithfarm/wip-doc-dev-typo

doc: fix typo in developer guide

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: fix typo in developer guide 6943/head
Nathan Cutler [Tue, 15 Dec 2015 14:25:45 +0000 (15:25 +0100)]
doc: fix typo in developer guide

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agomds: fix setvxattr (broken in a536d114) 6941/head
John Spray [Tue, 15 Dec 2015 13:20:03 +0000 (13:20 +0000)]
mds: fix setvxattr (broken in a536d114)

There was an accidental move of this line
when adding the MAY_SET_POOL check, which
was causing setxattr to proceed before
it had the right locks, and thereby apply
its checks on bad data (symptom was failing
to detect that the file had data written to it).

Fixes: #14029
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #6821 from H3C/wip-cephfs-f11322
John Spray [Tue, 15 Dec 2015 13:15:43 +0000 (13:15 +0000)]
Merge pull request #6821 from H3C/wip-cephfs-f11322

ceph-fuse: add process to ceph-fuse --help

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agomakefiles: remove bz2-dev from dependencies 6939/head
Piotr Dałek [Tue, 15 Dec 2015 13:01:51 +0000 (14:01 +0100)]
makefiles: remove bz2-dev from dependencies

The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.

Fixes: #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
10 years agoceph-fuse: add process to ceph-fuse --help 6821/head
Wei Feng [Wed, 9 Dec 2015 08:58:32 +0000 (03:58 -0500)]
ceph-fuse: add process to ceph-fuse --help

Signed-off-by: Wei Feng <feng.wei@h3c.com>
10 years agoMerge pull request #6934 from smithfarm/wip-14070
Loic Dachary [Tue, 15 Dec 2015 12:24:47 +0000 (13:24 +0100)]
Merge pull request #6934 from smithfarm/wip-14070

doc: Update list of admin/build-doc dependencies

Reviewed-by: Loic Dachary <ldachary@redhat.com>