]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore: fix OnodeSizeTracking testing 12684/head
xie xingguo [Tue, 27 Dec 2016 11:39:51 +0000 (19:39 +0800)]
os/bluestore: fix OnodeSizeTracking testing

[  FAILED  ] 1 test, listed below:
[  FAILED  ] ObjectStore/StoreTest.OnodeSizeTracking/2, where GetParam() = "bluestore"

 1 FAILED TEST

The above test failure happens as the bluestore mount() process
will try to load all collections and put them into the coll_map,
which will be also tracked as mempool::bluestore_meta_other.
So total_bytes from mempool won't be equal to zero.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12659 from kylinstorage/wip-remove-obsolete-configuration-option
Sage Weil [Mon, 26 Dec 2016 18:31:47 +0000 (12:31 -0600)]
Merge pull request #12659 from kylinstorage/wip-remove-obsolete-configuration-option

common/config_opts.h: remove obsolete configuration option

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12648 from Adirl/fix_RoCEv2_deafult_value
Haomai Wang [Mon, 26 Dec 2016 08:25:30 +0000 (16:25 +0800)]
Merge pull request #12648 from Adirl/fix_RoCEv2_deafult_value

msg/async/rdma: fix RoCE v2 deafult value

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12657 from badone/wip-c_read_operations-valgrind-fixes
Brad Hubbard [Mon, 26 Dec 2016 06:28:44 +0000 (16:28 +1000)]
Merge pull request #12657 from badone/wip-c_read_operations-valgrind-fixes

test/librados/c_read_operations.cc: Fix valgrind errors

Reviewed-by: liuchang0812 <liuchang0812@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12660 from liupan1111/wip-fix-dpdk-compile
Haomai Wang [Mon, 26 Dec 2016 06:02:34 +0000 (14:02 +0800)]
Merge pull request #12660 from liupan1111/wip-fix-dpdk-compile

async: Fixed compilation error when enable -DWITH_DPDK

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoasync: Fixed compilation error when enable -DWITH_DPDK 12660/head
Pan Liu [Mon, 26 Dec 2016 02:28:08 +0000 (10:28 +0800)]
async: Fixed compilation error when enable -DWITH_DPDK

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agotest/librados/c_read_operations.cc: Fix valgrind errors 12657/head
Brad Hubbard [Sun, 25 Dec 2016 05:29:52 +0000 (15:29 +1000)]
test/librados/c_read_operations.cc: Fix valgrind errors

Fixes: http://tracker.ceph.com/issues/18354
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agocommon/config_opts.h: remove obsolete configuration option 12659/head
Li Wang [Sun, 25 Dec 2016 14:00:20 +0000 (14:00 +0000)]
common/config_opts.h: remove obsolete configuration option

Signed-off-by: Li Wang <li.wang@kylin-cloud.com>
8 years agoMerge pull request #12474 from cbodley/wip-rgw-test-versioned
Orit Wasserman [Sun, 25 Dec 2016 10:47:27 +0000 (12:47 +0200)]
Merge pull request #12474 from cbodley/wip-rgw-test-versioned

test/rgw: add test for versioned object sync
Reviewed-by: Orit wasserman <owasserm@redhat.com>
8 years agoMerge pull request #12597 from badone/wip-osdmap-nocopy
Brad Hubbard [Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)]
Merge pull request #12597 from badone/wip-osdmap-nocopy

osd/OSDMap: Uncomment code to enable private default constructors

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12642 from theanalyst/doc/release-notes/11.1.1
Sage Weil [Sat, 24 Dec 2016 05:22:56 +0000 (23:22 -0600)]
Merge pull request #12642 from theanalyst/doc/release-notes/11.1.1

doc: release notes for v11.1.1

8 years agoMerge pull request #12582 from Liuchang0812/fix-store-version-bug
Sage Weil [Sat, 24 Dec 2016 05:19:37 +0000 (23:19 -0600)]
Merge pull request #12582 from Liuchang0812/fix-store-version-bug

os/filestore: version will be uninitialized varible if store_version doesn't exist

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12581 from Liuchang0812/fix-clang-warn-filestore
Sage Weil [Sat, 24 Dec 2016 05:19:15 +0000 (23:19 -0600)]
Merge pull request #12581 from Liuchang0812/fix-clang-warn-filestore

os/filestore: fix clang static check warn "use-after-free“

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12517 from hjwsm1989/wip-18266
Sage Weil [Sat, 24 Dec 2016 05:17:42 +0000 (23:17 -0600)]
Merge pull request #12517 from hjwsm1989/wip-18266

messages/MOSDPGTrim: add the missed HEAD_VERSION AND COMPAT_VERSION

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12518 from kylinstorage/wip-safe-read-cmd
Sage Weil [Sat, 24 Dec 2016 05:17:15 +0000 (23:17 -0600)]
Merge pull request #12518 from kylinstorage/wip-safe-read-cmd

common/admin-socket: fix potential buffer overflow

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12653 from wjwithagen/wjw-wip-denc-raw
Sage Weil [Sat, 24 Dec 2016 05:16:21 +0000 (23:16 -0600)]
Merge pull request #12653 from wjwithagen/wjw-wip-denc-raw

src/test/test_denc.cc: Fix errors in buffer overflow

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #12469 from bassam/pr-jemalloc-mallinfo
Sage Weil [Sat, 24 Dec 2016 05:10:45 +0000 (23:10 -0600)]
Merge pull request #12469 from bassam/pr-jemalloc-mallinfo

cmake: disable mallinfo for jemalloc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12468 from bassam/pr-simplify-jemalloc
Sage Weil [Sat, 24 Dec 2016 05:10:30 +0000 (23:10 -0600)]
Merge pull request #12468 from bassam/pr-simplify-jemalloc

cmake: simplify find_package jemalloc

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12519 from hjwsm1989/pgbackfill
Sage Weil [Sat, 24 Dec 2016 05:10:14 +0000 (23:10 -0600)]
Merge pull request #12519 from hjwsm1989/pgbackfill

osd/PG: simplify the logic of backfill_targets checking

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12585 from liewegas/wip-notify-ack
Sage Weil [Sat, 24 Dec 2016 04:54:23 +0000 (22:54 -0600)]
Merge pull request #12585 from liewegas/wip-notify-ack

osd/osd_types: print notify-ack op properly

8 years agoMerge pull request #12563 from xiexingguo/xxg-wip-osd-1217
Sage Weil [Sat, 24 Dec 2016 04:54:14 +0000 (22:54 -0600)]
Merge pull request #12563 from xiexingguo/xxg-wip-osd-1217

common: make attempts of auth rotating configurable

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11065 from LiumxNL/wip-fix-osdmap-update
Sage Weil [Sat, 24 Dec 2016 04:53:58 +0000 (22:53 -0600)]
Merge pull request #11065 from LiumxNL/wip-fix-osdmap-update

mon/OSDMonitor: should propose osdmap update when cluster addr changed

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12634 from liewegas/wip-bluestore-shard-keys
Sage Weil [Sat, 24 Dec 2016 04:53:08 +0000 (22:53 -0600)]
Merge pull request #12634 from liewegas/wip-bluestore-shard-keys

os/bluestore: do not cache shard keys

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge pull request #12635 from liewegas/wip-bluestore-cache
Sage Weil [Sat, 24 Dec 2016 04:52:43 +0000 (22:52 -0600)]
Merge pull request #12635 from liewegas/wip-bluestore-cache

os/bluestore: set cache meta ratio to .9

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #12644 from xiexingguo/xxg-wip-bluestore-keyreserve
Sage Weil [Sat, 24 Dec 2016 04:52:29 +0000 (22:52 -0600)]
Merge pull request #12644 from xiexingguo/xxg-wip-bluestore-keyreserve

os/bluestore: preallocate object[extent_shard] key to avoid reallocate

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agosrc/test/test_denc.cc: Fix errors in buffer overflow 12653/head
Willem Jan Withagen [Fri, 23 Dec 2016 23:46:54 +0000 (00:46 +0100)]
src/test/test_denc.cc: Fix errors in buffer overflow

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoos/bluestore: do not precalculate/cache shard keys 12634/head
Sage Weil [Fri, 23 Dec 2016 20:48:50 +0000 (15:48 -0500)]
os/bluestore: do not precalculate/cache shard keys

Note that we are generating it on demand now.  We can
probably do better, especially when in a loop.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12149 from adamemerson/wip-g_ceph_context-exterminate
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>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Fri, 23 Dec 2016 14:37:23 +0000 (09:37 -0500)]
Merge remote-tracking branch 'gh/kraken'

8 years agoMerge pull request #12630 from liewegas/wip-workunit-retry
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>
8 years agoMerge pull request #12614 from liewegas/wip-task-peer
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>
8 years agoMerge pull request #12559 from Adirl/verify_transport_type
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>
8 years agomsg/async: assert if compiled code doesn't support the configured ms_async_transport_type 12559/head
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>
8 years agoMerge pull request #12643 from xiexingguo/xxg-wip-bluestore-1123
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>
8 years agomsg/async/rdma: fix RoCE v2 deafult value 12648/head
Oren Duer [Mon, 12 Dec 2016 13:35:59 +0000 (15:35 +0200)]
msg/async/rdma: fix RoCE v2 deafult value

For backward compatibility, if no GID given or given GID is malformed,
use GID index 0.

Change-Id: I8c8ecbcfc0261e58c5a226ef6bc91297ec756182
Signed-off-by: Oren Duer <oren@mellanox.com> Adir Lev <adirl@mellanox.com>
Signed-off-by: Adir Lev <adirl@mellanox.com>
8 years agoos/bluestore: preallocate object[extent_shard] key to avoid reallocate 12644/head
xie xingguo [Fri, 23 Dec 2016 09:09:05 +0000 (17:09 +0800)]
os/bluestore: preallocate object[extent_shard] key to avoid reallocate

which is less efficient.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: remove intermediate key var to avoid string copy 12643/head
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>
8 years agodoc: release notes for v11.1.1 12642/head
Abhishek Lekshmanan [Fri, 23 Dec 2016 06:59:51 +0000 (12:29 +0530)]
doc: release notes for v11.1.1

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
8 years agoMerge pull request #12636 from badone/wip-doc-pg-states
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>
8 years agoMerge pull request #12543 from hjwsm1989/cleanup2
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>
8 years agodoc: Remove "splitting" state 12636/head
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>
8 years agoMerge pull request #12632 from liewegas/wip-centos-73
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>
8 years agoMerge remote-tracking branch 'gh/kraken'
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

8 years agoos/bluestore: set cache meta ratio to .9 12635/head
Sage Weil [Thu, 22 Dec 2016 22:47:18 +0000 (17:47 -0500)]
os/bluestore: set cache meta ratio to .9

More metadata, less data.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/distros: centos_7.yaml -> centos.yaml 12632/head
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>
8 years agoqa/suites: centos_7.2.yaml -> centos_7.yaml
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>
8 years agoqa/distros: add centos 7.3
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>
8 years agoqa/distros: add centos 7 yaml; use that instead
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>
8 years agomsg: Remove mention of g_ceph_context 12149/head
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>
8 years agoobjclass: Utterly destroy g_ceph_context
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>
8 years agoos: Complete removal of g_ceph_context and g_conf
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>
8 years agoos: Continuing the removal of g_ceph_context and g_conf
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>
8 years agoos/filestore: Destroy g_ceph_context and g_conf
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>
8 years agoos/bluestore: Remove g_ceph_context and g_conf
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>
8 years agoos: Add CephContext to ObjectStore and ObjectMap bases
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>
8 years agoosd: Remove g_conf and g_ceph_context
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>
8 years agodout: Use dout_context
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>
8 years agocommon: Remove now unused clock_offset option
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>
8 years agocommon: Unskew clock
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>
8 years agoMerge pull request #12629 from liewegas/wip-bluestore-shard-extents
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>
8 years agoMerge pull request #12616 from atheism/rgw-ldap-fix-simple-bind
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

8 years agoqa/tasks/workunit: clear clone dir before retrying checkout 12630/head
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>
8 years agoos/bluestore: remove 'extents' from shard_info 12629/head
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>
8 years agoMerge pull request #12394 from ifed01/wip-bluestore-fix-reshard
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>
8 years agoMerge pull request #12464 from ifed01/wip-bluestore-turnoff-block-write
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>
8 years agoMerge pull request #12526 from hjwsm1989/ec-cleanup
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>
8 years agoMerge pull request #12527 from hjwsm1989/cleanup
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>
8 years agoMerge pull request #12564 from kylinstorage/wip-cleanup-pg-stat-t
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>
8 years agoMerge pull request #12576 from kylinstorage/wip-cleanup-bluestore-coll-ref
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>
8 years agoMerge pull request #12579 from hjwsm1989/smallfix
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>
8 years agoMerge pull request #12583 from liupan1111/wip-add-throttle-bluestore
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>
8 years agoOSDMonitor: should propose osdmap update when OSD cluster_addr was changed 11065/head
Mingxin Liu [Wed, 31 Aug 2016 04:21:19 +0000 (12:21 +0800)]
OSDMonitor: should propose osdmap update when OSD cluster_addr was changed

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
8 years agoos/bluestore/bluefs: make bluefs_preextend_wal_files default is false.
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>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 14:16:03 +0000 (09:16 -0500)]
Merge remote-tracking branch 'gh/kraken'

8 years agomon: MonMap: clear 'mon_info' during decode
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>
8 years agoMerge pull request #12604 from ommoreno/wip-16966
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>
8 years agoMerge pull request #12618 from Liuchang0812/fix-blue-store-unused-var
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

8 years agoMerge branch 'kraken' into wip-18314 12599/head
Sage Weil [Thu, 22 Dec 2016 13:53:23 +0000 (07:53 -0600)]
Merge branch 'kraken' into wip-18314

8 years agoqa/tasks/peer: update task based on current peering behavior 12614/head
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>
8 years agoosd/PG: output recovery_state records for Down and Incomplete states
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>
8 years agoos/bluestore: remove a never read value 12618/head
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>
8 years agorgw: ldap: simple_bind() should set ldap option on tldap 12616/head
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>
8 years agoMerge pull request #12556 from Adirl/support_roceV2
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>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 03:21:41 +0000 (22:21 -0500)]
Merge remote-tracking branch 'gh/kraken'

8 years agoMerge pull request #12603 from liewegas/wip-fix-rwordered
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>
8 years agoOSDMap: Uncomment code to enable private default constructors 12597/head
Brad Hubbard [Wed, 21 Dec 2016 04:44:00 +0000 (14:44 +1000)]
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>
8 years agoosd: fix CEPH_OSD_FLAG_RWORDERED 12603/head
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>
8 years agoAdded "bluestore" prefix to new config options 12604/head
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>
8 years agomsg/async/rdma: Support for RoCE v2 and SL 12556/head
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>
8 years agoMerge pull request #12598 from ly798/typo-fix-in-docs
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>
8 years agoMerge pull request #12601 from rishabhkumar296/ceph12684
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>
8 years agoRemove dead code in pipe.cc 12601/head
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>
8 years agoosd/PrimaryLogPG: enlarge omap request bytes limitation
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>
8 years agodoc: typo fix in s3_compliance 12598/head
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>
8 years agoos/bluestore: add perf variable for throttle info in bluestore 12583/head
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>
8 years agoMerge pull request #12587 from yuriw/wip-fix-subset-script-master
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>
8 years agochanged script name 12587/head
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>
8 years agoMerge pull request #12590 from athanatos/wip-ping-write-ordered
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>
8 years agoMerge pull request #12593 from wjwithagen/wip-wjw-freebssd-SO_reuseaddr
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>
8 years agoMerge pull request #12584 from mkoderer/openstack_nova_doc
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>