RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-07 00:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,023 Commits 219 Branches 396 Tags 1.3 GiB
113686cb70
Commit Graph

67023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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