Commit Graph

55211 Commits

Author SHA1 Message Date
Mykola Golub
cfaff361e8 Merge pull request #9895 from dillaman/wip-16445
librbd: ignore snap unprotect -EBUSY errors during journal replay

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-24 22:19:19 +03:00
Sage Weil
c2e06d8efa init-ceph: make it behave when run from a cmake build dir
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-24 11:31:46 -04:00
John Spray
0862f92bd1 Merge pull request #9746 from xiexingguo/xxg-wip-mdcache_hoir
mds/MDCache: fix leak of MMDSOpenInoReply

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-06-24 15:58:06 +01:00
Jason Dillaman
97bade9f76 librbd: do not propagate mirror status notification failures
These should be treated as a broadcast since no ACK is required. The
peer will eventually see the notification or its watch will have timed
out and it will re-sync.

Fixes: http://tracker.ceph.com/issues/16470
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-24 10:03:53 -04:00
Igor Fedotov
a5b8b8aa27 Merge pull request #9921 from liewegas/wip-bluestore-fix-discard
os/bluestore: fix discard

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-24 15:20:17 +02:00
Sage Weil
daca542df7 os/bluestore: un-inline some 2Q methods
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-24 16:13:52 +03:00
Sage Weil
cd24dc855b os/bluestore: fix buffer discard accounting for 2Q
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-24 16:13:52 +03:00
Sage Weil
045829d7dc os/bluestore: simplify and fix blob invalidation
We can't invalidate based on any particular lextent we drop, as there may
be other lextents (in this onode or in another one) that reference the
same data.  This can break even a single multi-write transaction that
relies on the buffer cache to fill out blocks.

Fix by just doing the unallocated version unconditionally.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-24 08:57:10 -04:00
Jason Dillaman
81cfa070cf Merge pull request #9920 from zhouyuan/librd_remove
librbd: remove unused code block

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-24 08:56:28 -04:00
Sage Weil
24c5dbe2f8 Merge pull request #9916 from xiexingguo/xxg-wip-fix-decode-bnode
os/bluestore: fix decoding pool from bnode key

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-24 08:38:32 -04:00
Sage Weil
274820da08 Merge pull request #9910 from tchaikov/wip-cmake-drop-ceph-ra
cmake: ocf: drop ceph ra
2016-06-24 08:32:37 -04:00
Jason Dillaman
f506975084 librbd: memory leak possible if journal op event failed
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-24 08:21:37 -04:00
Yuan Zhou
8d80c05029 librbd: trivial fix to remove unused code block
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2016-06-24 15:44:28 +08:00
xie xingguo
59903e5463 os/bluestore: literal tidy-ups
There error codes are improperly arranged, which looks weird.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-24 15:13:15 +08:00
xie xingguo
815f90348b os/bluestore: make fsck can catch bad bnode key too
The case may be rare but the check shall do no harm.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-24 14:57:30 +08:00
xie xingguo
cff6ff7928 os/bluestore: fix decoding pool from bnode key
The current result is raw and not properly translated.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-24 14:53:39 +08:00
Kefu Chai
cb5da01ce1 cmake: ocf: drop ceph ra
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-24 09:32:25 +08:00
Sage Weil
92b979f730 os/bluestore: default to bitmap allocator
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-24 09:29:53 +08:00
Kefu Chai
522377019c Merge pull request #9906 from stiopaa1/msg_asyncmess_workepool_deleteCopycontrAndAss
msg/AsyncMessenger:delete cpy constr and assign op

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-24 09:16:20 +08:00
David Zafman
22d5d08a5c Merge pull request #9273 from stiopaa1/osd_removeClosingBrace_
osd/OSD.h: remove closing brace } from comment

Reviewed-by: David Zafman <dzafman@redhat.com>
2016-06-23 14:59:55 -07:00
Sage Weil
44c78301f3 Merge pull request #9842 from jcsp/wip-vstart-len
vstart: set osd_check_max_object_name_len_on_startup
2016-06-23 17:43:11 -04:00
Sage Weil
72c1039d67 Merge pull request #8784 from ddiss/vstart_ifconfig
vstart: replace ifconfig usage with ip addr

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2016-06-23 17:24:58 -04:00
Samuel Just
569babc629 Merge pull request #9456 from ukernel/wip-msg-seq
msg: don't truncate message sequence to 32-bits

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-06-23 13:07:13 -07:00
Samuel Just
c962c72092 Merge pull request #9248 from xiexingguo/xxg-wip-expose-requirejewel
mon: expose require_jewel_osds flag to user

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-23 13:03:34 -07:00
Samuel Just
e345b2158b Merge pull request #9305 from xiexingguo/xxg-wip-replicatedpg-fixup
osd/ReplicatedPG: minor fixes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-23 13:01:45 -07:00
Ali Maredia
f534862340 Merge pull request #9904 from cbodley/wip-cmake-vstart
cmake: add radosgw to 'make vstart' target

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-06-23 14:48:06 -04:00
Michal Jarzabek
01629a0646 msg/AsyncMessenger:delete cpy constr and assign op
Delete copy constructor and assignment operator, so the checking can
be moved from linking to compile time - as it was when the above
where only declared, but not defined.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-23 19:03:48 +01:00
Jason Dillaman
1811e62aa0 librbd: mark exclusive lock as released after journal is closed
Fixes: http://tracker.ceph.com/issues/16450
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-23 13:34:56 -04:00
Mykola Golub
463a78cdd5 Merge pull request #9882 from dillaman/wip-16364
librbd: fix crash while using advisory locks with R/O image

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-23 20:26:11 +03:00
Mykola Golub
c763018adf Merge pull request #9881 from dillaman/wip-16433
librbd: journal::Replay no longer holds lock while completing callback

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-23 20:25:38 +03:00
Mykola Golub
bfe8421036 Merge pull request #9867 from dillaman/wip-16411
rbd-mirror: disallow proxied maintenance ops to non-primary images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-23 20:25:03 +03:00
Casey Bodley
d3d0a114d3 cmake: add cls libraries as radosgw dependencies
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-06-23 12:54:27 -04:00
Sage Weil
8cedd91744 Merge pull request #9880 from stiopaa1/msg_asyncConn_move_workerpool
msg/async: mv WorkerPool class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-23 12:25:04 -04:00
Sage Weil
1ddc00b45c Merge pull request #8818 from SUSE/wip-drop-ceph-ra
ocf: drop ceph Resource Agent

Reviewed-by: Tim Serong <tserong@suse.com>
2016-06-23 12:18:54 -04:00
Casey Bodley
bda27b4825 cmake: add ceph-mds to 'make vstart' target only if WITH_MDS
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-06-23 12:05:57 -04:00
Casey Bodley
309242a005 cmake: add radosgw, radosgw-admin to 'make vstart' target
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-06-23 12:05:09 -04:00
Kefu Chai
270808e788 Merge pull request #9902 from liewegas/wip-cmake-tests
cmake: do not exclude tests from 'make all'

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-23 23:15:02 +08:00
Jason Dillaman
68b296b0f1 librbd: ignore missing object map during snap remove
Fixes: http://tracker.ceph.com/issues/16350
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-23 10:25:54 -04:00
Sage Weil
824931368f cmake: do not exclude tests from 'make all'
This prevent us from doing 'make' and then 'ctest ...'.
It is also super annoying in general to not verify the
tests compile with a simple 'make'.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-23 09:44:46 -04:00
Sage Weil
3d034aadeb Merge pull request #9870 from liewegas/wip-cmake
do_cmake.sh: simple cmake helper

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-23 09:28:27 -04:00
Sage Weil
0d10262bfd README.md: note about builds (they are for development!)
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-23 09:28:09 -04:00
Jason Dillaman
677832ceb2 librbd: delete ExclusiveLock instance when switching to snapshot
Fixes: http://tracker.ceph.com/issues/16446
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-23 09:23:32 -04:00
Sage Weil
51826cc0b9 Merge pull request #9887 from ceph/wip-cmake
cmake: fix linking issues

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-23 09:14:44 -04:00
Sage Weil
9dc3eb6117 Merge pull request #9890 from xiexingguo/xxg-wip-fix-bfs-alloc
os/bluestore: shutdown allocator of bluefs more gracefully

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-23 08:57:05 -04:00
Jason Dillaman
beef0b4b02 librbd: ignore snap unprotect -EBUSY errors during journal replay
Fixes: http://tracker.ceph.com/issues/16445
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-23 08:50:38 -04:00
xie xingguo
af1bb01cd9 os/bluestore: remove duplicated reset of buf
buf->reset() will do the clear up effectively.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-23 20:10:50 +08:00
xie xingguo
86944f0ea1 os/bluestore: add sanity check for underflow
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-23 20:09:01 +08:00
xie xingguo
319a14e201 os/bluestore: use hex version for offset/length
We update bluestore this way a couple of days ago.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-23 20:07:25 +08:00
xie xingguo
ed71c3ed00 os/bluestore: kill dead code
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-23 20:07:25 +08:00
xie xingguo
9e35ac192e os/bluestore: shutdown allocator of bluefs more gracefully
The new BitAllocator requires we call shutdown() explicitly,
thus we shall fix it here before we apply to the new BitAllocator.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-23 20:07:25 +08:00