]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore: _txc_release_alloc when do wal cleaning 12692/head
Xinze Chi [Wed, 28 Dec 2016 02:33:40 +0000 (10:33 +0800)]
os/bluestore: _txc_release_alloc when do wal cleaning

Signed-off-by: Xinze Chi <xinze@xsky.com>
8 years agoMerge pull request #12336 from kylinstorage/wip-cleanup-use-string-ref
Sage Weil [Tue, 27 Dec 2016 22:38:17 +0000 (16:38 -0600)]
Merge pull request #12336 from kylinstorage/wip-cleanup-use-string-ref

osd: cleanup: use string & to avoid unnecessary copy

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12569 from liewegas/wip-bluestore-raw-unused
Sage Weil [Tue, 27 Dec 2016 22:37:15 +0000 (16:37 -0600)]
Merge pull request #12569 from liewegas/wip-bluestore-raw-unused

os/bluestore/bluestore_types: drop std::bitset for blob unused

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
8 years agoMerge pull request #12612 from fangyuxiangGL/master
Sage Weil [Tue, 27 Dec 2016 22:36:44 +0000 (16:36 -0600)]
Merge pull request #12612 from fangyuxiangGL/master

osd/ReplicatedBackend: do not set omap header if it is empty

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12668 from hjwsm1989/pg-unfound
Sage Weil [Tue, 27 Dec 2016 22:36:18 +0000 (16:36 -0600)]
Merge pull request #12668 from hjwsm1989/pg-unfound

osd/PG: add new have_unfound() function in MissingLoc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12674 from Liuchang0812/tools-rados-offset-support
Sage Weil [Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)]
Merge pull request #12674 from Liuchang0812/tools-rados-offset-support

tools/rados: add a parameter "--offset" to rados put command

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12675 from Liuchang0812/fix-test-case-in-rados
Sage Weil [Tue, 27 Dec 2016 22:35:29 +0000 (16:35 -0600)]
Merge pull request #12675 from Liuchang0812/fix-test-case-in-rados

test: replace hard-code binary names with varibles

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12655 from ceph/wip-fix-fio
Sage Weil [Tue, 27 Dec 2016 15:34:59 +0000 (09:34 -0600)]
Merge pull request #12655 from ceph/wip-fix-fio

test/fio_ceph_objectstore: fix fio plugin build failure caused by rec…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12682 from renhwztetecs/renhw-wip-mon-osdmonitor-sortbitwise
Sage Weil [Tue, 27 Dec 2016 15:30:59 +0000 (09:30 -0600)]
Merge pull request #12682 from renhwztetecs/renhw-wip-mon-osdmonitor-sortbitwise

mon/OSDMonitor: fixup sortbitwise flag warning

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12654 from yuyuyu101/wip-fix-async-subop
Sage Weil [Tue, 27 Dec 2016 15:26:00 +0000 (09:26 -0600)]
Merge pull request #12654 from yuyuyu101/wip-fix-async-subop

messages/MOSDSubOp: Make encode_payload can be reentrant

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12662 from Liuchang0812/doc-fix
Kefu Chai [Tue, 27 Dec 2016 13:09:06 +0000 (21:09 +0800)]
Merge pull request #12662 from Liuchang0812/doc-fix

doc: fix document about rados mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12198 from tchaikov/wip-pybind-freebsd
Kefu Chai [Tue, 27 Dec 2016 12:52:07 +0000 (20:52 +0800)]
Merge pull request #12198 from tchaikov/wip-pybind-freebsd

pybind: conditional compile the linux specific constant

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agomon/OSDMonitor: fixup sortbitwise flag warning 12682/head
huanwen ren [Tue, 27 Dec 2016 10:54:45 +0000 (10:54 +0000)]
mon/OSDMonitor: fixup sortbitwise flag warning

"ceph -s" does not report warning when using
command "ceph osd unset sortbitwise" to drop
sortbitwise flag.
we should use "osdmap.get_up_osd_features() &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT"
instead of "(osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)",
because osdmap.get_features only get local "features"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
8 years agoReplicatedBackend: do not set omap header if it is empty 12612/head
fangyuxiang [Thu, 22 Dec 2016 02:43:27 +0000 (10:43 +0800)]
ReplicatedBackend: do not set omap header if it is empty

In replicatedpg backfill, objects have no omap header or keys previously, but an empty omap header will be inserted when they are pushed to replica, which leads leveldb performance degrade seriously when cluster has huge number of objects.
so my opinion is that we does't insert omap header if is size is zero when handle PushOp in recovery.

Signed-off-by: fang yuxiang <fang.yuxiang@eisoo.com>
8 years agotools/rados: add parameter offset for put cmd and test case for it 12674/head
liuchang0812 [Tue, 27 Dec 2016 02:42:38 +0000 (10:42 +0800)]
tools/rados: add parameter offset for put cmd and test case for it

add a parameter "--offset" for put command
add a test case for rados put command

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agodoc: fix document about rados mon 12662/head
liuchang0812 [Mon, 26 Dec 2016 06:56:14 +0000 (14:56 +0800)]
doc: fix document about rados mon

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #12663 from badone/wip-ceph_test_rados_api_c_write_operations...
Kefu Chai [Tue, 27 Dec 2016 06:44:35 +0000 (14:44 +0800)]
Merge pull request #12663 from badone/wip-ceph_test_rados_api_c_write_operations-valgrind-fixes

c_write_operations.cc: Fix trivial memory leak

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest: replace hard-code binary names with varibles 12675/head
liuchang0812 [Tue, 27 Dec 2016 06:18:29 +0000 (14:18 +0800)]
test: replace hard-code binary names with varibles

This test case couldn't run under customize env CEPH_BIN.

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #12672 from liupan1111/wip-fix-nvme-driver-compile-issue
Haomai Wang [Tue, 27 Dec 2016 06:07:07 +0000 (14:07 +0800)]
Merge pull request #12672 from liupan1111/wip-fix-nvme-driver-compile-issue

bluestore: fixed compilation error when enable spdk

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agobluestore: fixed compilation error when enable spdk 12672/head
Pan Liu [Tue, 27 Dec 2016 04:41:59 +0000 (12:41 +0800)]
bluestore: fixed compilation error when enable spdk

Signed-off-by: Pan Liu <pan.liu@istuary.com>
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 ago osd/PG: add new have_unfound() function in MissingLoc 12668/head
huangjun [Mon, 26 Dec 2016 11:36:26 +0000 (19:36 +0800)]
  osd/PG: add new have_unfound() function in MissingLoc
          No need to lookup all objects in needs_recovery_map if only want to
          know whether if there are unfound objects.

Signed-off-by: huangjun <hjwsm1989@gmail.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 agoc_write_operations.cc: Fix trivial memory leak 12663/head
Brad Hubbard [Mon, 26 Dec 2016 08:16:30 +0000 (18:16 +1000)]
c_write_operations.cc: Fix trivial memory leak

Signed-off-by: Brad Hubbard <bhubbard@redhat.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 agotest/fio_ceph_objectstore: fix fio plugin build failure caused by recent g_ceph_conte... 12655/head
Igor Fedotov [Sat, 24 Dec 2016 22:20:04 +0000 (22:20 +0000)]
test/fio_ceph_objectstore: fix fio plugin build failure caused by recent g_ceph_context removal

Signed-off-by: Igor Fedotov <ifedotov@mirantis.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 agomessages/MOSDSubOp: Make encode_payload can be reentrant 12654/head
Haomai Wang [Sat, 24 Dec 2016 03:33:34 +0000 (11:33 +0800)]
messages/MOSDSubOp: Make encode_payload can be reentrant

Otherwise, AsyncConnection will use uninitialized feature to encode
message. The caller side will set a old version header but encode with newest
feature since passing feature is ok. It will let receiver side got a old
header version but newest payload decode result.

Signed-off-by: Haomai Wang <haomai@xsky.com>
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