Commit Graph

67097 Commits

Author SHA1 Message Date
Adam C. Emerson
921d6e050e os: Complete removal of g_ceph_context and g_conf
And so it continues.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 14:24:39 -05:00
Adam C. Emerson
ec815bb934 os: Continuing the removal of g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 14:24:39 -05:00
Adam C. Emerson
120debe522 os/filestore: Destroy g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 14:24:39 -05:00
Adam C. Emerson
113686cb70 os/bluestore: Remove g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 14:24:39 -05:00
Adam C. Emerson
f002a2fc96 os: Add CephContext to ObjectStore and ObjectMap bases
Preparatory to removing g_ceph_context and g_conf uses

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 13:55:37 -05:00
Adam C. Emerson
1d5e967a05 osd: Remove g_conf and g_ceph_context
So begins the ruthless annihilation of g_ceph_context.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 13:55:37 -05:00
Adam C. Emerson
b9182564c7 dout: Use dout_context
As a transition for g_ceph_context removal, make all dout macros depends
on a local macro.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 13:55:37 -05:00
Adam C. Emerson
0863f5415e common: Remove now unused clock_offset option
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 13:55:37 -05:00
Adam C. Emerson
750ad8340c common: Unskew clock
In preparation to deglobalizing CephContext, remove the CephContext*
parameter to ceph_clock_now() and ceph::real_clock::now() that carries
a configurable offset.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-12-22 13:55:37 -05:00
Sage Weil
ba5b81e4a9 Merge pull request #12629 from liewegas/wip-bluestore-shard-extents
os/bluestore: remove 'extents' from shard_info

Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
2016-12-22 12:50:32 -06:00
Matt Benjamin
566ad2d8b5 Merge pull request #12616 from atheism/rgw-ldap-fix-simple-bind
rgw: ldap: simple_bind() should set ldap version option on tldap
2016-12-22 13:49:04 -05:00
Sage Weil
2a7013cd5a qa/tasks/workunit: clear clone dir before retrying checkout
If we checkout ceph-ci.git, and don't find a branch,
we'll try again from ceph.git. But the checkout will
already exist and the clone will fail, so we'll still
fail to find the branch.

The same can happen if a previous workunit task already
checked out the repo.

Fix by removing the repo before checkout (the first and
second times).  Note that this may break if there are
multiple workunit tasks running in parallel on the same
role.  That is already racy, so if it's happening, we'll
want to switch to using a truly unique clonedir for each
instantiation.

Fixes: http://tracker.ceph.com/issues/18336
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-22 13:05:22 -05:00
Sage Weil
05a10d84ec os/bluestore: remove 'extents' from shard_info
We don't use this field; no need to consume the space
on disk.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-22 11:03:51 -05:00
Sage Weil
fcbabddfe4 Merge pull request #12394 from ifed01/wip-bluestore-fix-reshard
os/bluestore: refactor ExtentMap::update to avoid preceeding db updat…

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:25:05 -06:00
Sage Weil
7a157524b7 Merge pull request #12464 from ifed01/wip-bluestore-turnoff-block-write
os/bluestore: add a debug option to bypass block device writes for bl…

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:24:42 -06:00
Sage Weil
6c889cf8da Merge pull request #12526 from hjwsm1989/ec-cleanup
osd/ECBackend: only need check missing_loc when doing recovery

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-22 09:24:31 -06:00
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
Mingxin Liu
fe33935453 OSDMonitor: should propose osdmap update when OSD cluster_addr was changed
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
2016-12-22 22:49:00 +08:00
Jianpeng Ma
ca209949be os/bluestore/bluefs: make bluefs_preextend_wal_files default is false.
This make rocksdb log corruption. Before fix, disable this function.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-12-22 09:47:35 -05: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
Sage Weil
e1781dd573 qa/tasks/peer: update task based on current peering behavior
This changed in 0be3f5f72e.

Fixes: http://tracker.ceph.com/issues/18330
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-22 08:40:45 -05:00
Sage Weil
be72197a55 osd/PG: output recovery_state records for Down and Incomplete states
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-22 08:40:45 -05: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
Weibing Zhang
96cf7fa06a rgw: ldap: simple_bind() should set ldap option on tldap
ldap_set_option() should set option for "tldap" other than "ldap".
    The current code will lead to "Protocol error" as the ldap version
    of tldap is not set.

Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
2016-12-22 14:38:27 +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
Brad Hubbard
3f3a72b42e OSDMap: Uncomment code to enable private default constructors
C++11 is here so let's enable this code.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-12-22 10:12:16 +10: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