]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Haomai Wang [Wed, 28 Dec 2016 09:56:32 +0000 (17:56 +0800)]
test_userspace_event: fix missing std
Signed-off-by: Haomai Wang <haomai@xsky.com>
Haomai Wang [Wed, 28 Dec 2016 09:55:45 +0000 (17:55 +0800)]
msg/dpdk/TCP: remove unneeded CephContext argument
Signed-off-by: Haomai Wang <haomai@xsky.com>
Sage Weil [Fri, 23 Dec 2016 14:40:48 +0000 (08:40 -0600)]
Merge pull request #12149 from adamemerson/wip-g_ceph_context-exterminate
global: start removing g_ceph_context
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Fri, 23 Dec 2016 14:37:23 +0000 (09:37 -0500)]
Merge remote-tracking branch 'gh/kraken'
Sage Weil [Fri, 23 Dec 2016 14:12:35 +0000 (08:12 -0600)]
Merge pull request #12630 from liewegas/wip-workunit-retry
qa/tasks/workunit: clear clone dir before retrying checkout
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 23 Dec 2016 14:11:36 +0000 (08:11 -0600)]
Merge pull request #12614 from liewegas/wip-task-peer
qa/tasks/peer: update task based on current peering behavior
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Haomai Wang [Fri, 23 Dec 2016 13:38:15 +0000 (21:38 +0800)]
Merge pull request #12559 from Adirl/verify_transport_type
msg/async: assert if compiled code doesn't support the configured ms_…
Reviewed-by: Haomai Wang <haomai@xsky.com>
Avner BenHanoch [Mon, 5 Dec 2016 08:16:02 +0000 (08:16 +0000)]
msg/async: assert if compiled code doesn't support the configured ms_async_transport_type
for example, currently there is a crash when using the async stack (access of null pointer)
in case the user configured rdma for a code that was not compiled with RDMA
issue: 913397
Change-Id: I4e3d88006312a713b8d3aaefbdcd0596039270e1
Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>
Igor Fedotov [Fri, 23 Dec 2016 11:52:48 +0000 (14:52 +0300)]
Merge pull request #12643 from xiexingguo/xxg-wip-bluestore-1123
os/bluestore: remove intermediate key var to avoid string copy
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: whu liuchang <liuchang0812@gmail.com>
xie xingguo [Fri, 23 Dec 2016 08:56:33 +0000 (16:56 +0800)]
os/bluestore: remove intermediate key var to avoid string copy
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Xie Xingguo [Fri, 23 Dec 2016 02:33:53 +0000 (10:33 +0800)]
Merge pull request #12636 from badone/wip-doc-pg-states
doc: Remove "splitting" state
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Xie Xingguo [Fri, 23 Dec 2016 00:57:03 +0000 (08:57 +0800)]
Merge pull request #12543 from hjwsm1989/cleanup2
osd/ECBackend: remove unused variable "ReadCB"
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Brad Hubbard [Thu, 22 Dec 2016 23:23:19 +0000 (09:23 +1000)]
doc: Remove "splitting" state
There is no splitting state so remove it from pg-states.rst
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Thu, 22 Dec 2016 23:19:07 +0000 (15:19 -0800)]
Merge pull request #12632 from liewegas/wip-centos-73
qa/suites: switch from centos 7.2 to 7.x
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Sage Weil [Thu, 22 Dec 2016 23:16:49 +0000 (18:16 -0500)]
Merge remote-tracking branch 'gh/kraken'
# Conflicts:
# src/os/bluestore/BlueStore.cc
Sage Weil [Thu, 22 Dec 2016 22:19:42 +0000 (17:19 -0500)]
qa/distros: centos_7.yaml -> centos.yaml
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 20:41:25 +0000 (15:41 -0500)]
qa/suites: centos_7.2.yaml -> centos_7.yaml
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 20:39:41 +0000 (15:39 -0500)]
qa/distros: add centos 7.3
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 20:39:35 +0000 (15:39 -0500)]
qa/distros: add centos 7 yaml; use that instead
No need to be picky about the point release here.
Signed-off-by: Sage Weil <sage@redhat.com>
Adam C. Emerson [Thu, 8 Dec 2016 03:06:38 +0000 (22:06 -0500)]
msg: Remove mention of g_ceph_context
Since it won't exist any more there's no point in saying it can't be
relied on, now is there?
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Thu, 8 Dec 2016 03:04:57 +0000 (22:04 -0500)]
objclass: Utterly destroy g_ceph_context
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Thu, 8 Dec 2016 02:50:42 +0000 (21:50 -0500)]
os: Complete removal of g_ceph_context and g_conf
And so it continues.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 7 Dec 2016 23:32:54 +0000 (18:32 -0500)]
os: Continuing the removal of g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Fri, 9 Dec 2016 00:23:52 +0000 (19:23 -0500)]
os/filestore: Destroy g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 7 Dec 2016 21:31:35 +0000 (16:31 -0500)]
os/bluestore: Remove g_ceph_context and g_conf
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Thu, 8 Dec 2016 20:34:49 +0000 (15:34 -0500)]
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>
Adam C. Emerson [Tue, 6 Dec 2016 22:24:12 +0000 (17:24 -0500)]
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>
Adam C. Emerson [Wed, 16 Nov 2016 17:38:08 +0000 (12:38 -0500)]
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>
Adam C. Emerson [Tue, 15 Nov 2016 00:37:47 +0000 (19:37 -0500)]
common: Remove now unused clock_offset option
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 15 Nov 2016 00:33:56 +0000 (19:33 -0500)]
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>
Sage Weil [Thu, 22 Dec 2016 18:50:32 +0000 (12:50 -0600)]
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>
Matt Benjamin [Thu, 22 Dec 2016 18:49:04 +0000 (13:49 -0500)]
Merge pull request #12616 from atheism/rgw-ldap-fix-simple-bind
rgw: ldap: simple_bind() should set ldap version option on tldap
Sage Weil [Thu, 22 Dec 2016 18:05:22 +0000 (13:05 -0500)]
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>
Sage Weil [Thu, 22 Dec 2016 16:03:51 +0000 (11:03 -0500)]
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>
Sage Weil [Thu, 22 Dec 2016 15:25:05 +0000 (09:25 -0600)]
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>
Sage Weil [Thu, 22 Dec 2016 15:24:42 +0000 (09:24 -0600)]
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>
Sage Weil [Thu, 22 Dec 2016 15:24:31 +0000 (09:24 -0600)]
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>
Sage Weil [Thu, 22 Dec 2016 15:24:01 +0000 (09:24 -0600)]
Merge pull request #12527 from hjwsm1989/cleanup
osd/PrimaryLogPG: unify the access to primary pg
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 15:23:10 +0000 (09:23 -0600)]
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>
Sage Weil [Thu, 22 Dec 2016 15:22:54 +0000 (09:22 -0600)]
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>
Sage Weil [Thu, 22 Dec 2016 15:22:38 +0000 (09:22 -0600)]
Merge pull request #12579 from hjwsm1989/smallfix
osd/PG: check the connection first in fulfill_log
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 15:20:02 +0000 (09:20 -0600)]
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>
Jianpeng Ma [Thu, 22 Dec 2016 16:06:50 +0000 (00:06 +0800)]
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>
Sage Weil [Thu, 22 Dec 2016 14:16:03 +0000 (09:16 -0500)]
Merge remote-tracking branch 'gh/kraken'
Joao Eduardo Luis [Wed, 21 Dec 2016 23:40:47 +0000 (23:40 +0000)]
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>
Sage Weil [Thu, 22 Dec 2016 14:04:26 +0000 (08:04 -0600)]
Merge pull request #12604 from ommoreno/wip-16966
os/bluestore: allow multiple SPDK BlueStore OSD instances
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Sage Weil [Thu, 22 Dec 2016 13:55:35 +0000 (07:55 -0600)]
Merge pull request #12618 from Liuchang0812/fix-blue-store-unused-var
os/bluestore: remove a never read value
Sage Weil [Thu, 22 Dec 2016 13:53:23 +0000 (07:53 -0600)]
Merge branch 'kraken' into wip-18314
Sage Weil [Thu, 22 Dec 2016 04:06:09 +0000 (23:06 -0500)]
qa/tasks/peer: update task based on current peering behavior
This changed in
0be3f5f72e169fad08dcb0240de45287b567bd49 .
Fixes: http://tracker.ceph.com/issues/18330
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Dec 2016 13:40:05 +0000 (08:40 -0500)]
osd/PG: output recovery_state records for Down and Incomplete states
Signed-off-by: Sage Weil <sage@redhat.com>
liuchang0812 [Thu, 22 Dec 2016 08:17:55 +0000 (16:17 +0800)]
os/bluestore: remove a never read value
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
Weibing Zhang [Thu, 22 Dec 2016 06:38:27 +0000 (14:38 +0800)]
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>
Haomai Wang [Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)]
Merge pull request #12556 from Adirl/support_roceV2
msg/async/rdma: Support for RoCE v2 and SL
Reviewed-by: Haomai Wang <haomai@xsky.com>
Sage Weil [Thu, 22 Dec 2016 03:21:41 +0000 (22:21 -0500)]
Merge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 03:03:43 +0000 (21:03 -0600)]
Merge pull request #12603 from liewegas/wip-fix-rwordered
osd: fix CEPH_OSD_FLAG_RWORDERED
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Wed, 21 Dec 2016 19:24:37 +0000 (14:24 -0500)]
osd: fix CEPH_OSD_FLAG_RWORDERED
Broke this in
3a2ed3b136de68192f661b6992cbb96ce6aafd20 .
Signed-off-by: Sage Weil <sage@redhat.com>
Orlando Moreno [Wed, 21 Dec 2016 17:18:37 +0000 (10:18 -0700)]
Added "bluestore" prefix to new config options
Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
Adir Lev [Sun, 11 Dec 2016 16:38:58 +0000 (16:38 +0000)]
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>
Sage Weil [Wed, 21 Dec 2016 15:56:50 +0000 (09:56 -0600)]
Merge pull request #12598 from ly798/typo-fix-in-docs
doc: typo fix in s3_compliance
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 21 Dec 2016 15:54:31 +0000 (09:54 -0600)]
Merge pull request #12601 from rishabhkumar296/ceph12684
msg/simple: Remove dead code in pipe.cc
Reviewed-by: Sage Weil <sage@redhat.com>
Rishabh Kumar [Wed, 21 Dec 2016 15:09:44 +0000 (20:39 +0530)]
Remove dead code in pipe.cc
Fixes: http://tracker.ceph.com/issues/12684
Signed-off-by: Rishabh Kumar <kris.kr296@gmail.com>
Yan, Zheng [Wed, 21 Dec 2016 08:35:50 +0000 (16:35 +0800)]
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>
LiuYang [Wed, 21 Dec 2016 06:54:40 +0000 (14:54 +0800)]
doc: typo fix in s3_compliance
Signed-off-by: LiuYang <yippeetry@gmail.com>
Pan Liu [Wed, 21 Dec 2016 02:28:26 +0000 (10:28 +0800)]
os/bluestore: add perf variable for throttle info in bluestore
Signed-off-by: Pan Liu <pan.liu@istuary.com>
Jason Dillaman [Tue, 20 Dec 2016 23:47:39 +0000 (18:47 -0500)]
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>
Yuri Weinstein [Tue, 20 Dec 2016 17:36:19 +0000 (09:36 -0800)]
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>
Sage Weil [Tue, 20 Dec 2016 23:13:31 +0000 (17:13 -0600)]
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>
Sage Weil [Tue, 20 Dec 2016 20:07:23 +0000 (14:07 -0600)]
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>
Jason Dillaman [Tue, 20 Dec 2016 19:00:36 +0000 (14:00 -0500)]
Merge pull request #12584 from mkoderer/openstack_nova_doc
doc: mention corresponding libvirt section in nova.conf
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Willem Jan Withagen [Tue, 20 Dec 2016 18:43:47 +0000 (19:43 +0100)]
msg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Samuel Just [Tue, 20 Dec 2016 17:47:41 +0000 (09:47 -0800)]
osd/: treat PINGs as RWORDERED
89fd030bf9436dc4e37cc3a0f935ec077455d9d5 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>
Sage Weil [Tue, 20 Dec 2016 15:56:32 +0000 (09:56 -0600)]
Merge pull request #12540 from dmick/wip-18297
ceph.in: allow 'flags' to not be present in cmddescs
Josh Durgin [Tue, 20 Dec 2016 15:51:24 +0000 (07:51 -0800)]
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>
Sage Weil [Tue, 20 Dec 2016 14:43:29 +0000 (08:43 -0600)]
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>
Marc Koderer [Tue, 20 Dec 2016 13:49:19 +0000 (14:49 +0100)]
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>
Mykola Golub [Tue, 20 Dec 2016 11:10:55 +0000 (13:10 +0200)]
Merge pull request #12472 from dillaman/wip-18244
librbd: remove image header lock assertions
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
huangjun [Tue, 20 Dec 2016 05:31:59 +0000 (13:31 +0800)]
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>
Sage Weil [Tue, 20 Dec 2016 03:26:41 +0000 (21:26 -0600)]
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>
Sage Weil [Tue, 20 Dec 2016 03:18:19 +0000 (21:18 -0600)]
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>
Sage Weil [Tue, 20 Dec 2016 03:17:19 +0000 (21:17 -0600)]
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>
Sage Weil [Tue, 20 Dec 2016 03:15:37 +0000 (21:15 -0600)]
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>
Sage Weil [Tue, 20 Dec 2016 02:55:54 +0000 (21:55 -0500)]
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>
Yunchuan Wen [Tue, 20 Dec 2016 01:52:30 +0000 (09:52 +0800)]
bluestore: avoid unnecessary copy with coll_t
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
Orlando Moreno [Mon, 19 Dec 2016 23:57:32 +0000 (16:57 -0700)]
os/bluestore: allow multiple SPDK BlueStore OSD instances
Fixes: http://tracker.ceph.com/issues/16966
Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
Sage Weil [Mon, 19 Dec 2016 22:04:26 +0000 (17:04 -0500)]
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>
Samuel Just [Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)]
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>
vasukulkarni [Mon, 19 Dec 2016 20:25:38 +0000 (12:25 -0800)]
Merge pull request #12572 from liewegas/wip-python-rados-test
qa/workunits: include extension for nose tests
Sage Weil [Mon, 19 Dec 2016 20:15:03 +0000 (14:15 -0600)]
Merge pull request #12568 from ifed01/wip-bluestore-onode-diet2
os/bluestore: reduce Onode in-memory footprint
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 19 Dec 2016 20:13:32 +0000 (14:13 -0600)]
Merge pull request #12555 from socketpair/usr_bin
systemd: Fix startup of ceph-mgr on Debian 8
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 19 Dec 2016 20:13:10 +0000 (14:13 -0600)]
Merge pull request #12355 from chhabaramesh/bit_alloc_mempool
os/bluestore: simplified allocator interfaces to single apis
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 19 Dec 2016 19:08:11 +0000 (14:08 -0500)]
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>
jtlayton [Mon, 19 Dec 2016 18:26:27 +0000 (13:26 -0500)]
Merge pull request #12412 from ceph/wip-jlayton-suid
client/mds: Clear setuid bits when writing or truncating
Willem Jan Withagen [Mon, 19 Dec 2016 16:29:38 +0000 (17:29 +0100)]
Clang/str_list.h: fix clang warning about std::move
/home/jenkins/workspace/ceph-master/src/include/str_list.h:99:10: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
return std::move(str_vec);
^
/home/jenkins/workspace/ceph-master/src/include/str_list.h:99:10: note: remove std::move call here
return std::move(str_vec);
^~~~~~~~~~ ~
1 warning generated.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Jason Dillaman [Mon, 19 Dec 2016 15:33:24 +0000 (10:33 -0500)]
Merge pull request #12565 from trociny/wip-18247-fixup
common: fix clang compilation error
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Igor Fedotov [Mon, 19 Dec 2016 14:37:06 +0000 (14:37 +0000)]
os/bluestore: remove duplicate sbid member for Blob, use one from shared_blob member
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Mon, 19 Dec 2016 14:00:05 +0000 (14:00 +0000)]
os/bluestore: declare a member for Blob's cached bufferlist if explicitly enabled by CACHE_BLOG_BL macro only
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Mon, 19 Dec 2016 12:55:09 +0000 (12:55 +0000)]
os/bluestore: recalculate shared blob key instead of keeping it in memory
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Sage Weil [Mon, 19 Dec 2016 15:03:44 +0000 (10:03 -0500)]
os/bluestore: include modified objects in flush list even if onode unchanged
We use the onode flush list so that we can ->flush() as
a barrier before doing any read/modify/write. For
example, omap_rmkeyrange will flush before reading to
see what keys to erase in order to ensure that any
previous inserts are applied to the db and we see them
and remove them.
However, some omap operations don't update the onode
itself, which means write_onode() doesn't get called and
we aren't put on this list.
Add a note_modified_object() helper that can be called
instead of write_onode() for those cases. That way we
get on the list and flush() works as expected.
We could have resolved this by just putting ourselves on
the dirty onode list, but in practice every OSD op is
writing omap keys to the pgmeta object and there is no
need to touch the onode key in this case, so doing so
would be a big regression.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 19 Dec 2016 14:44:27 +0000 (08:44 -0600)]
Merge pull request #12548 from Liuchang0812/add-document-rgw
doc: explain rgw_fcgi_socket_backlog in rgw/config-ref.rst
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 19 Dec 2016 14:38:43 +0000 (08:38 -0600)]
Merge pull request #12561 from kylinstorage/wip-fix-osdmaptool-zero
osdmaptool: fix divide by zero error
Reviewed-by: Sage Weil <sage@redhat.com>