Commit Graph

67008 Commits

Author SHA1 Message Date
Sage Weil
5308718101 Merge pull request #12527 from hjwsm1989/cleanup
osd/PrimaryLogPG: unify the access to primary pg

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:24:01 -06:00
Sage Weil
f75d653316 Merge pull request #12564 from kylinstorage/wip-cleanup-pg-stat-t
osd/ECBackend: cleanup for unnecessary copy with pg_stat_t

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-22 09:23:10 -06:00
Sage Weil
66768d33cb Merge pull request #12576 from kylinstorage/wip-cleanup-bluestore-coll-ref
bluestore: avoid unnecessary copy with coll_t

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:22:54 -06:00
Sage Weil
aa43ed3930 Merge pull request #12579 from hjwsm1989/smallfix
osd/PG: check the connection first in fulfill_log

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:22:38 -06:00
Sage Weil
59c1db1620 Merge pull request #12583 from liupan1111/wip-add-throttle-bluestore
os/bluestore: add perf variable for throttle info in bluestore

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:20:02 -06:00
Sage Weil
4bb082eede Merge remote-tracking branch 'gh/kraken' 2016-12-22 09:16:03 -05:00
Joao Eduardo Luis
36ecfbd8bf mon: MonMap: clear 'mon_info' during decode
It so happens that it's not safe to assume the monmap will be in an
empty state upon decoding.

Turns out the MonClient will reuse the MonMap instance when decoding
the just received map from the monitors. Should the monitors be on an
older version that do not support 'mon_info', this field will not be
decoded (after all, there's no field to decode from); but by this time,
the MonClient would already have a built monmap, which could have
populated 'mon_info' with temporary mon names from 'mon initial
members'.

Given the existing entries in 'mon_info', and the conflicting entries in
'mon_addr', we would end up asserting in 'sanitize_mons()'. This becomes
a non-issue if 'mon_info' is empty, as was unfortunately presumed.

Fixes: http://tracker.ceph.com/issues/18265
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2016-12-22 09:13:37 -05:00
Sage Weil
9cabda1421 Merge pull request #12604 from ommoreno/wip-16966
os/bluestore: allow multiple SPDK BlueStore OSD instances

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-22 08:04:26 -06:00
Sage Weil
f884ad5ec0 Merge pull request #12618 from Liuchang0812/fix-blue-store-unused-var
os/bluestore: remove a never read value
2016-12-22 07:55:35 -06:00
Sage Weil
3824ad3fec Merge branch 'kraken' into wip-18314 2016-12-22 07:53:23 -06:00
liuchang0812
3bfca80256 os/bluestore: remove a never read value
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2016-12-22 16:18:10 +08:00
Haomai Wang
436d5e6d80 Merge pull request #12556 from Adirl/support_roceV2
msg/async/rdma: Support for RoCE v2 and SL

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-12-22 12:25:30 +08:00
Sage Weil
94bb715acb Merge remote-tracking branch 'gh/kraken' 2016-12-21 22:21:41 -05:00
Sage Weil
600b52c76a Merge pull request #12603 from liewegas/wip-fix-rwordered
osd: fix CEPH_OSD_FLAG_RWORDERED

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-21 21:03:43 -06:00
Sage Weil
f169b6b888 osd: fix CEPH_OSD_FLAG_RWORDERED
Broke this in 3a2ed3b136.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-21 14:24:37 -05:00
Orlando Moreno
6c05702a02 Added "bluestore" prefix to new config options
Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
2016-12-21 10:18:37 -07:00
Adir Lev
8faa809d68 msg/async/rdma: Support for RoCE v2 and SL
Adding GID support to ceph.conf
Search configured GID in GIDs table with specific RoCE version.
Use it instead of index 0 (default)
Add service level support to supprt PFC

Change-Id: I5369bdeb6797e1c440110bdb4ad8e54ee6db9857
Signed-off-by: Oren Duer <oren@mellanox.com> Adir Lev <adirl@mellanox.com>
2016-12-21 17:08:38 +00:00
Sage Weil
af21f0db91 Merge pull request #12598 from ly798/typo-fix-in-docs
doc: typo fix in s3_compliance

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-21 09:56:50 -06:00
Sage Weil
fc2b953c73 Merge pull request #12601 from rishabhkumar296/ceph12684
msg/simple: Remove dead code in pipe.cc

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-21 09:54:31 -06:00
Rishabh Kumar
fa58ed6bc4 Remove dead code in pipe.cc
Fixes: http://tracker.ceph.com/issues/12684
Signed-off-by: Rishabh Kumar <kris.kr296@gmail.com>
2016-12-21 20:39:44 +05:30
Yan, Zheng
08066eb92d osd/PrimaryLogPG: enlarge omap request bytes limitation
For cephfs, 4M buffer can only encode about 5k dentries. It's too
small for directory.

Fixes: http://tracker.ceph.com/issues/18314
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-12-21 16:44:31 +08:00
LiuYang
273251197a doc: typo fix in s3_compliance
Signed-off-by: LiuYang <yippeetry@gmail.com>
2016-12-21 14:54:40 +08:00
Pan Liu
3e40595f3c os/bluestore: add perf variable for throttle info in bluestore
Signed-off-by: Pan Liu <pan.liu@istuary.com>
2016-12-21 10:28:26 +08:00
Jason Dillaman
12706d7622 Merge pull request #12587 from yuriw/wip-fix-subset-script-master
qa: fixed script to schedule rados and other suites with --subset option

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-12-20 18:47:39 -05:00
Yuri Weinstein
56975c039b changed script name
added kraken
parameterized suite name to be able to use for rados, rbd etc.

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2016-12-20 15:34:56 -08:00
Sage Weil
d877b27883 Merge pull request #12590 from athanatos/wip-ping-write-ordered
osd: force watch PING to be write ordered

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-20 17:13:31 -06:00
Sage Weil
c0b64fb070 Merge pull request #12593 from wjwithagen/wip-wjw-freebssd-SO_reuseaddr
msg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-20 14:07:23 -06:00
Jason Dillaman
5563ff343f Merge pull request #12584 from mkoderer/openstack_nova_doc
doc: mention corresponding libvirt section in nova.conf

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-12-20 14:00:36 -05:00
Willem Jan Withagen
0825f170e4 msg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-12-20 19:43:47 +01:00
Samuel Just
3a2ed3b136 osd/: treat PINGs as RWORDERED
89fd030bf9 switched them to show up
as reads to avoid logging them, but we still pipeline them with
reconnects.  Thus, also force them to be rwordered.

Fixes: http://tracker.ceph.com/issues/18310
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-12-20 09:47:41 -08:00
Sage Weil
e0903c9e08 Merge pull request #12540 from dmick/wip-18297
ceph.in: allow 'flags' to not be present in cmddescs
2016-12-20 09:56:32 -06:00
Josh Durgin
a84de42792 Merge pull request #12577 from liewegas/wip-osd-backfill
qa/tasks/osd_backfill.py: wait for osd.[12] to start

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-12-20 07:51:24 -08:00
Sage Weil
d5d864189a Merge pull request #12574 from liewegas/wip-bluestore-split
os/bluestore: preserve source collection cache during split

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-20 08:43:29 -06:00
Marc Koderer
6229edfec4 DOC: Mention corresponding section in nova.conf
rbd_user and rbd_secret_uuid are part of the libvirt configuration.

Signed-off-by: Marc Koderer <marc@koderer.com>
2016-12-20 14:52:34 +01:00
Mykola Golub
47d2662998 Merge pull request #12472 from dillaman/wip-18244
librbd: remove image header lock assertions

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-12-20 13:10:55 +02:00
huangjun
f7d7824abc osd/PG: check the connection first in fulfill_log
No need to prepare reply message if the connection not exist

  Signed-off-by: huangjun <hjwsm1989@gmail.com>
2016-12-20 13:31:59 +08:00
Sage Weil
6a786a8306 Merge pull request #12532 from ifed01/wip-bluestore-large-onode-test
os/bluestore: add UT for an estimation of Onode in-memory size

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 21:26:41 -06:00
Sage Weil
34ab000053 Merge pull request #12505 from ceph/wip-jlayton-submount
client: set metadata["root"] from mount method when it's called with …

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2016-12-19 21:18:19 -06:00
Sage Weil
73fa83866e Merge pull request #12570 from wjwithagen/patch-9
common/str_list.h: fix clang warning about std::move

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-12-19 21:17:19 -06:00
Sage Weil
f674fa24fb Merge pull request #12541 from liewegas/wip-bluestore-omap-flush
os/bluestore: include modified objects in flush list even if onode unchanged

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-19 21:15:37 -06:00
Sage Weil
c922404a03 qa/tasks/osd_backfill.py: wait for osd.[12] to start
...before sending a tell command.  Otherwise osd.2 might
start without 1, the io unblocks, and the tell fails
because osd.1 is still down.

Fixes: http://tracker.ceph.com/issues/18303
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-19 21:56:11 -05:00
Yunchuan Wen
c4fa36ad75 bluestore: avoid unnecessary copy with coll_t
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2016-12-20 09:52:30 +08:00
Orlando Moreno
d548d5a1f0 os/bluestore: allow multiple SPDK BlueStore OSD instances
Fixes: http://tracker.ceph.com/issues/16966

Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
2016-12-19 16:57:32 -07:00
Sage Weil
ec5ba4e8cf os/bluestore: preserve source collection cache during split
OSD split transactions look something like

 mkcoll new
 split old
 ...
 omap_rmkey_range old
 omap_setkeys old
 omap_setkeys new

The last part splits the log into two pieces.  The
problem is that the rmkey_range needs to wait on old
omap transactions to flush, and those are linked to the
old onode, and split clears the cache.  The result is
that we don't wait, rmkeyrange leaves some recent pg log
keys behind, and on OSD restart we get an error because
the object doesn't belong to the (old) collection.

Fix this by preserving objects in the old collection and
only clear out objects that are moving to the newly
split collections.  This will include the pgmeta object
that we care about.

(Note that we are one step closer to preserving the
cache contents across the split, but not quite there
yet: at this point we don't have all of the destination
collections.  A change in the ObjectStore interface is
probably needed to make that not be extremely awkward.)

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-19 17:05:00 -05:00
Samuel Just
dc639fd9e5 Merge pull request #12571 from athanatos/wip-15943
osd: Fix map gaps again (bug 15943)

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 13:50:15 -08:00
vasukulkarni
c3afbbf30b Merge pull request #12572 from liewegas/wip-python-rados-test
qa/workunits: include extension for nose tests
2016-12-19 12:25:38 -08:00
Sage Weil
e82291342a Merge pull request #12568 from ifed01/wip-bluestore-onode-diet2
os/bluestore: reduce Onode in-memory footprint

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 14:15:03 -06:00
Sage Weil
3079dfc840 Merge pull request #12555 from socketpair/usr_bin
systemd: Fix startup of ceph-mgr on Debian 8

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 14:13:32 -06:00
Sage Weil
3649d1fc3c Merge pull request #12355 from chhabaramesh/bit_alloc_mempool
os/bluestore: simplified allocator interfaces to single apis

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 14:13:10 -06:00
Sage Weil
5666fd61d6 qa/workunits: include extension for nose tests
When you have a relative path you have to include the extension.
Weird.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-19 14:08:11 -05:00