]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomsg/async: refactor NetHandler::set_priority() to sync with msg/simple 14878/head
Kefu Chai [Sat, 29 Apr 2017 05:26:36 +0000 (13:26 +0800)]
msg/async: refactor NetHandler::set_priority() to sync with msg/simple

so it's sync'ed with Pipe::set_socket_options()

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/simple: use my addr when setting sock priority
Kefu Chai [Sat, 29 Apr 2017 05:27:49 +0000 (13:27 +0800)]
msg/simple: use my addr when setting sock priority

actually we always fails to set ToS of listening
socket. 6f1037e22c2a304795895498cdc955e0ef80f8e3 reveals this issue.

Fixes: http://tracker.ceph.com/issues/19801
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14872 from tchaikov/wip-19770
Kefu Chai [Sat, 29 Apr 2017 04:39:24 +0000 (12:39 +0800)]
Merge pull request #14872 from tchaikov/wip-19770

qa/erasure-code: override min_size to 2

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoqa/erasure-code: override min_size to 2 14872/head
Kefu Chai [Fri, 28 Apr 2017 14:20:14 +0000 (22:20 +0800)]
qa/erasure-code: override min_size to 2

so isa(k=2,m=1) can survive with 1 down OSD.

Fixes: http://tracker.ceph.com/issues/19770
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/tasks/rados: add optional setting of "min_size"
Kefu Chai [Fri, 28 Apr 2017 14:18:26 +0000 (22:18 +0800)]
qa/tasks/rados: add optional setting of "min_size"

this setting only affects the newly created pool

Fixes: http://tracker.ceph.com/issues/19770
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14758 from xiexingguo/fix-can_mark_out-output
Sage Weil [Sat, 29 Apr 2017 00:40:44 +0000 (19:40 -0500)]
Merge pull request #14758 from xiexingguo/fix-can_mark_out-output

mon/OSDMonitor: fix output func name in can_mark_out

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14847 from smithfarm/wip-19797
Sage Weil [Sat, 29 Apr 2017 00:39:12 +0000 (19:39 -0500)]
Merge pull request #14847 from smithfarm/wip-19797

tests: rados: move cephtool.yaml to new singleton/bluestore subsuite

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14849 from tchaikov/wip-19787
Sage Weil [Sat, 29 Apr 2017 00:38:30 +0000 (19:38 -0500)]
Merge pull request #14849 from tchaikov/wip-19787

mon/OSDMonitor: do not alter the "created" epoch of a pg

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14161 from jcsp/wip-mgr-legacy-mds
Sage Weil [Fri, 28 Apr 2017 21:43:41 +0000 (16:43 -0500)]
Merge pull request #14161 from jcsp/wip-mgr-legacy-mds

mgr: fix metadata handling from old MDS daemons

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14706 from SUSE/wip-fix-19629
Sage Weil [Fri, 28 Apr 2017 21:41:27 +0000 (16:41 -0500)]
Merge pull request #14706 from SUSE/wip-fix-19629

mgr: fix crash on set_config from python module with insufficient caps

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14855 from tchaikov/wip-increase-lec
Sage Weil [Fri, 28 Apr 2017 21:40:30 +0000 (16:40 -0500)]
Merge pull request #14855 from tchaikov/wip-increase-lec

mon/OSDMonitor: increase last_epoch_clean's lower bound if possible

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14859 from liewegas/wip-nonnull
Sage Weil [Fri, 28 Apr 2017 21:40:02 +0000 (16:40 -0500)]
Merge pull request #14859 from liewegas/wip-nonnull

librados: fix rados_pool_list when buf is null

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14860 from liupan1111/wip-fix-journal-sleep-performance
Sage Weil [Fri, 28 Apr 2017 21:39:09 +0000 (16:39 -0500)]
Merge pull request #14860 from liupan1111/wip-fix-journal-sleep-performance

os/filestore: use new sleep strategy when io_submit gets EAGAIN.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14862 from tchaikov/wip-templatize-intarith
Sage Weil [Fri, 28 Apr 2017 21:38:51 +0000 (16:38 -0500)]
Merge pull request #14862 from tchaikov/wip-templatize-intarith

include/intarith: templatize ctz/clz/cbits helpers

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14863 from tchaikov/wip-kill-clang-warnings
Sage Weil [Fri, 28 Apr 2017 21:38:33 +0000 (16:38 -0500)]
Merge pull request #14863 from tchaikov/wip-kill-clang-warnings

osd/OSDMap: should update input param if osd dne

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14864 from renhwztetecs/renhw-wip-mgr-key
Sage Weil [Fri, 28 Apr 2017 21:38:06 +0000 (16:38 -0500)]
Merge pull request #14864 from renhwztetecs/renhw-wip-mgr-key

mgr: add mgr allow * to client.admin

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14832 from dillaman/wip-rbd-mirror-deletion
Mykola Golub [Fri, 28 Apr 2017 18:01:17 +0000 (21:01 +0300)]
Merge pull request #14832 from dillaman/wip-rbd-mirror-deletion

rbd-mirror: image deletions should be handled by assigned instance

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14842 from cbodley/wip-rgw-admin-suite
Yehuda Sadeh [Fri, 28 Apr 2017 16:39:59 +0000 (09:39 -0700)]
Merge pull request #14842 from cbodley/wip-rgw-admin-suite

qa/rgw: fix assertions in radosgw_admin task

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14826 from tchaikov/wip-prime-pg-temp
Sage Weil [Fri, 28 Apr 2017 16:27:22 +0000 (11:27 -0500)]
Merge pull request #14826 from tchaikov/wip-prime-pg-temp

mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #14818 from tchaikov/wip-rocksdb
Sage Weil [Fri, 28 Apr 2017 16:26:54 +0000 (11:26 -0500)]
Merge pull request #14818 from tchaikov/wip-rocksdb

rocksdb: sync with upstream

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14817 from TsaiJin/wip-set-boolean-variable-with-boolean-value
Yuri Weinstein [Fri, 28 Apr 2017 15:38:06 +0000 (08:38 -0700)]
Merge pull request #14817 from TsaiJin/wip-set-boolean-variable-with-boolean-value

osd: ReplicatedBackend::prep_push() remove redundant variable assignments

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14835 from tchaikov/wip-19743
Yuri Weinstein [Fri, 28 Apr 2017 15:34:19 +0000 (08:34 -0700)]
Merge pull request #14835 from tchaikov/wip-19743

mgr: do shutdown using finisher so we can do it in the right order

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14838 from liewegas/wip-mgr-dirs
Yuri Weinstein [Fri, 28 Apr 2017 15:32:52 +0000 (08:32 -0700)]
Merge pull request #14838 from liewegas/wip-mgr-dirs

debian/ceph-base.dirs: create bootstrap-mgr dirs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #14384 from hrchu/radosgw-admin-key
Kefu Chai [Fri, 28 Apr 2017 15:32:16 +0000 (23:32 +0800)]
Merge pull request #14384 from hrchu/radosgw-admin-key

doc: rgw: Rewrite the key management

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14848 from dillaman/wip-19798
Mykola Golub [Fri, 28 Apr 2017 14:26:39 +0000 (17:26 +0300)]
Merge pull request #14848 from dillaman/wip-19798

test: remove hard-coded image name from RBD metadata test

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13315 from dang/wip-build-no-nss
Sage Weil [Fri, 28 Apr 2017 13:47:46 +0000 (08:47 -0500)]
Merge pull request #13315 from dang/wip-build-no-nss

cmake: Allow tests to build without NSS

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14367 from mslovy/wip-fix-infinitloops
Sage Weil [Fri, 28 Apr 2017 13:47:05 +0000 (08:47 -0500)]
Merge pull request #14367 from mslovy/wip-fix-infinitloops

os/filestore: fix infinit loops in fiemap()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14391 from LiumxNL/wip-170407
Sage Weil [Fri, 28 Apr 2017 13:46:47 +0000 (08:46 -0500)]
Merge pull request #14391 from LiumxNL/wip-170407

mon/PGMonitor: fix wrongly report "pg stuck in inactive"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14675 from ifed01/wip-bluestore-nolock
Sage Weil [Fri, 28 Apr 2017 13:46:23 +0000 (08:46 -0500)]
Merge pull request #14675 from ifed01/wip-bluestore-nolock

os/bluestore: eliminate some excessive stuff

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agotests: rados: move cephtool.yaml to new singleton/bluestore subsuite 14847/head
Nathan Cutler [Thu, 27 Apr 2017 19:52:51 +0000 (21:52 +0200)]
tests: rados: move cephtool.yaml to new singleton/bluestore subsuite

cephtool.yaml is bluestore-only, yet it was in singleton/ which runs against a
generalized objectstore matrix.

Fixes: http://tracker.ceph.com/issues/19797
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #14475 from liewegas/wip-message-compat-cruft
Sage Weil [Fri, 28 Apr 2017 13:30:19 +0000 (08:30 -0500)]
Merge pull request #14475 from liewegas/wip-message-compat-cruft

messages: remove compat cruft

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: move TransContext finalization out of osr_lock to avoid potential conte... 14675/head
Igor Fedotov [Fri, 21 Apr 2017 17:07:32 +0000 (10:07 -0700)]
os/bluestore: move TransContext finalization out of osr_lock to avoid potential contention.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: get rid off Onode::flush_txn set.
Igor Fedotov [Thu, 20 Apr 2017 14:46:21 +0000 (07:46 -0700)]
os/bluestore: get rid off Onode::flush_txn set.
It looks like flushing_count counter is enough.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agomgr: add mgr allow * to client.admin 14864/head
huanwen ren [Fri, 28 Apr 2017 07:40:33 +0000 (15:40 +0800)]
mgr: add mgr allow * to client.admin

Signed-off-by: huanwen ren ren.huanwen@zte.com.cn
8 years agocommon/hobject: use string::append() to avoid temp object 14863/head
Kefu Chai [Fri, 28 Apr 2017 06:13:53 +0000 (14:13 +0800)]
common/hobject: use string::append() to avoid temp object

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoosd/OSDMap: should update input param if osd dne
Kefu Chai [Fri, 28 Apr 2017 06:08:19 +0000 (14:08 +0800)]
osd/OSDMap: should update input param if osd dne

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/obj_bencher: silence divide by zero warning
Kefu Chai [Fri, 28 Apr 2017 06:02:52 +0000 (14:02 +0800)]
common/obj_bencher: silence divide by zero warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotest/test_async_driver: silence clang static analyzer warning
Kefu Chai [Fri, 28 Apr 2017 06:01:50 +0000 (14:01 +0800)]
test/test_async_driver: silence clang static analyzer warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobluestore: use std::atomic<uint8_t> for min_alloc_size_order 14862/head
Kefu Chai [Fri, 28 Apr 2017 06:15:54 +0000 (14:15 +0800)]
bluestore: use std::atomic<uint8_t> for min_alloc_size_order

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/intarith: templatize ctz/clz/cbits helpers
Kefu Chai [Fri, 28 Apr 2017 06:15:31 +0000 (14:15 +0800)]
include/intarith: templatize ctz/clz/cbits helpers

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoos/filestore: use new sleep strategy when io_submit gets EAGAIN. 14860/head
Pan Liu [Fri, 28 Apr 2017 03:36:46 +0000 (11:36 +0800)]
os/filestore: use new sleep strategy when io_submit gets EAGAIN.

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
8 years agolibcephfs: handle path==null to ceph_get_osd_crush_location 14859/head
Sage Weil [Fri, 28 Apr 2017 03:06:45 +0000 (23:06 -0400)]
libcephfs: handle path==null to ceph_get_osd_crush_location

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agolibrados: fix rados_pool_list when buf is null
Sage Weil [Fri, 28 Apr 2017 03:02:25 +0000 (23:02 -0400)]
librados: fix rados_pool_list when buf is null

This was the original intent, but buf==NULL wasn't documented
and only half-way implemented.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14840 from drunkard/master
Kefu Chai [Fri, 28 Apr 2017 02:57:53 +0000 (10:57 +0800)]
Merge pull request #14840 from drunkard/master

doc: style fix for doc/cephfs/client-config-ref.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: typo fixes in doc/cephfs/client-config-ref.rst 14840/head
Drunkard Zhang [Fri, 28 Apr 2017 01:53:17 +0000 (09:53 +0800)]
doc: typo fixes in doc/cephfs/client-config-ref.rst

fixed:
  Reference symbol, i.e. s/`/``/
  Hyperlink typo at ``client_trace``

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
8 years agoMerge pull request #14302 from liewegas/wip-19452
Sage Weil [Fri, 28 Apr 2017 01:02:38 +0000 (20:02 -0500)]
Merge pull request #14302 from liewegas/wip-19452

osdc/Objecter: handle command target that goes down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14850 from tchaikov/wip-cmake
Kefu Chai [Fri, 28 Apr 2017 00:57:58 +0000 (08:57 +0800)]
Merge pull request #14850 from tchaikov/wip-cmake

cmake: add "container" to required boost components

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agomon/OSDMonitor: increase last_epoch_clean's lower bound if possible 14855/head
Kefu Chai [Fri, 28 Apr 2017 00:44:46 +0000 (08:44 +0800)]
mon/OSDMonitor: increase last_epoch_clean's lower bound if possible

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14794 from joscollin/wip-warning-simplespin
Brad Hubbard [Fri, 28 Apr 2017 00:22:39 +0000 (10:22 +1000)]
Merge pull request #14794 from joscollin/wip-warning-simplespin

test: fixing assert that creates warning: comparison between signed and unsigned integer expressions

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoqa/rgw: fix assertions in radosgw_admin task 14842/head
Casey Bodley [Thu, 27 Apr 2017 18:29:08 +0000 (14:29 -0400)]
qa/rgw: fix assertions in radosgw_admin task

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agomon/OSDMonitor: use emplace() to avoid creating temporary elements 14849/head
Kefu Chai [Thu, 27 Apr 2017 22:25:40 +0000 (06:25 +0800)]
mon/OSDMonitor: use emplace() to avoid creating temporary elements

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomon/OSDMonitor: do not alter the "created" epoch of a pg
Kefu Chai [Thu, 27 Apr 2017 20:47:18 +0000 (04:47 +0800)]
mon/OSDMonitor: do not alter the "created" epoch of a pg

Fixes: http://tracker.ceph.com/issues/19787
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: add "container" to required boost components 14850/head
Kefu Chai [Thu, 27 Apr 2017 21:07:00 +0000 (05:07 +0800)]
cmake: add "container" to required boost components

it is used by our denc

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14843 from wjwithagen/wip-wjw-fix-pipe
Sage Weil [Thu, 27 Apr 2017 20:51:25 +0000 (15:51 -0500)]
Merge pull request #14843 from wjwithagen/wip-wjw-fix-pipe

src/msg/simple/Pipe.cc: Fix the inclusion of '}'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest: remove hard-coded image name from RBD metadata test 14848/head
Jason Dillaman [Thu, 27 Apr 2017 20:21:33 +0000 (16:21 -0400)]
test: remove hard-coded image name from RBD metadata test

Fixes: http://tracker.ceph.com/issues/19798
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: provide image status updates without remotes 14832/head
Jason Dillaman [Tue, 25 Apr 2017 20:55:44 +0000 (16:55 -0400)]
rbd-mirror: provide image status updates without remotes

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: new state machine for preparing local image
Jason Dillaman [Tue, 25 Apr 2017 19:45:18 +0000 (15:45 -0400)]
rbd-mirror: new state machine for preparing local image

This state machine will be invoked before the bootstrap state machine
and will be responsible for detecting if the local image is already
primary or if it needs to be deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: remove duplicative journal helper functions
Jason Dillaman [Tue, 25 Apr 2017 16:36:10 +0000 (12:36 -0400)]
librbd: remove duplicative journal helper functions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: forward initial pool image deletions to instance
Jason Dillaman [Tue, 25 Apr 2017 03:02:17 +0000 (23:02 -0400)]
rbd-mirror: forward initial pool image deletions to instance

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: deletions should be scheduled using global ids
Jason Dillaman [Tue, 25 Apr 2017 13:51:12 +0000 (09:51 -0400)]
rbd-mirror: deletions should be scheduled using global ids

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: pass pool watcher image ids by rvalue
Jason Dillaman [Tue, 25 Apr 2017 01:55:12 +0000 (21:55 -0400)]
rbd-mirror: pass pool watcher image ids by rvalue

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agosrc/msg/simple/Pipe.cc: Fix the inclusion of '}' 14843/head
Willem Jan Withagen [Thu, 27 Apr 2017 18:44:26 +0000 (20:44 +0200)]
src/msg/simple/Pipe.cc: Fix the inclusion of '}'

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14754 from trociny/wip-19128
Jason Dillaman [Thu, 27 Apr 2017 18:40:51 +0000 (14:40 -0400)]
Merge pull request #14754 from trociny/wip-19128

rbd: import needs to sanity check auto-generated image name

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14592 from prallabh/wip-manifest
Yehuda Sadeh [Thu, 27 Apr 2017 18:25:00 +0000 (11:25 -0700)]
Merge pull request #14592 from prallabh/wip-manifest

rgw: custom user data header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14816 from cbodley/wip-rgw-test-multi-list-fix
Casey Bodley [Thu, 27 Apr 2017 17:38:15 +0000 (13:38 -0400)]
Merge pull request #14816 from cbodley/wip-rgw-test-multi-list-fix

test/rgw: fix for empty lists as default arguments

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14473 from ShiqiCooperation/master
Sage Weil [Thu, 27 Apr 2017 17:33:06 +0000 (12:33 -0500)]
Merge pull request #14473 from ShiqiCooperation/master

os/bluestore: assert blob map returns success

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14491 from liewegas/wip-bluestore-deferred-rewrite
Sage Weil [Thu, 27 Apr 2017 17:32:52 +0000 (12:32 -0500)]
Merge pull request #14491 from liewegas/wip-bluestore-deferred-rewrite

os/bluestore: rewrite deferred write handling

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14695 from dachary/wip-choosleaf-stable
Sage Weil [Thu, 27 Apr 2017 17:32:31 +0000 (12:32 -0500)]
Merge pull request #14695 from dachary/wip-choosleaf-stable

crush: builder: legacy has chooseleaf_stable = 0

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14696 from dachary/wip-crush-workspace
Sage Weil [Thu, 27 Apr 2017 17:32:21 +0000 (12:32 -0500)]
Merge pull request #14696 from dachary/wip-crush-workspace

crush: crush_init_workspace starts with struct crush_work

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14814 from neha-ojha/wip-osd-filestore-default
Sage Weil [Thu, 27 Apr 2017 17:32:09 +0000 (12:32 -0500)]
Merge pull request #14814 from neha-ojha/wip-osd-filestore-default

osd: switch filestore to default to rocksdb

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14795 from tchaikov/wip-so-priority-cleanup
Kefu Chai [Thu, 27 Apr 2017 16:48:23 +0000 (00:48 +0800)]
Merge pull request #14795 from tchaikov/wip-so-priority-cleanup

msg/async: return right away in NetHandler::set_priority() if not supported

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14802 from tchaikov/wip-mgr-cleanup
Sage Weil [Thu, 27 Apr 2017 16:43:32 +0000 (11:43 -0500)]
Merge pull request #14802 from tchaikov/wip-mgr-cleanup

mgr: various cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14807 from liewegas/wip-jewel-x
Sage Weil [Thu, 27 Apr 2017 16:43:12 +0000 (11:43 -0500)]
Merge pull request #14807 from liewegas/wip-jewel-x

ceph_test_rados_api_tier: tolerate ENOENT from 'pg scrub'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14717 from liewegas/wip-bluestore-remove-max-ops
Yuri Weinstein [Thu, 27 Apr 2017 16:35:09 +0000 (09:35 -0700)]
Merge pull request #14717 from liewegas/wip-bluestore-remove-max-ops

os/bluestore: rename/fix throttle options

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14819 from tchaikov/wip-objecter-more-constness
Sage Weil [Thu, 27 Apr 2017 16:26:45 +0000 (11:26 -0500)]
Merge pull request #14819 from tchaikov/wip-objecter-more-constness

osdc/Objecter: more constness

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14773 from viva64/sizeof_pointer
Yuri Weinstein [Thu, 27 Apr 2017 16:22:01 +0000 (09:22 -0700)]
Merge pull request #14773 from viva64/sizeof_pointer

src/msg/async/AsyncConnect.cc: Use of sizeof() on a Pointer Type

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14782 from yuyuyu101/wip-rdma-perf
Yuri Weinstein [Thu, 27 Apr 2017 16:19:35 +0000 (09:19 -0700)]
Merge pull request #14782 from yuyuyu101/wip-rdma-perf

msg/async/rdma: add inqueue rx chunks perf counter

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14797 from wjwithagen/wip-wjw-freebsd-config-path
Yuri Weinstein [Thu, 27 Apr 2017 16:15:56 +0000 (09:15 -0700)]
Merge pull request #14797 from wjwithagen/wip-wjw-freebsd-config-path

common/config: Add /usr/local/etc/ceph to default paths

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14801 from tchaikov/wip-crypto-cleanup
Yuri Weinstein [Thu, 27 Apr 2017 16:15:25 +0000 (09:15 -0700)]
Merge pull request #14801 from tchaikov/wip-crypto-cleanup

crypto: cleanup NSPR in main thread

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14805 from tchaikov/wip-mon-check-get
Yuri Weinstein [Thu, 27 Apr 2017 16:13:30 +0000 (09:13 -0700)]
Merge pull request #14805 from tchaikov/wip-mon-check-get

mon/OSDMonitor: check get()'s return value instead of bl's length

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14836 from idryomov/wip-krbd-wac-tests
Jason Dillaman [Thu, 27 Apr 2017 15:42:55 +0000 (11:42 -0400)]
Merge pull request #14836 from idryomov/wip-krbd-wac-tests

qa: krbd write-after-checksum tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14803 from hrchu/rgwadmin-api-doc-usage-conf
Yehuda Sadeh [Thu, 27 Apr 2017 15:42:09 +0000 (08:42 -0700)]
Merge pull request #14803 from hrchu/rgwadmin-api-doc-usage-conf

doc: rgw: note rgw_enable_usage_log option in adminops guide

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agodebian/ceph-base.dirs: create bootstrap-mgr dirs 14838/head
Sage Weil [Thu, 27 Apr 2017 14:47:39 +0000 (10:47 -0400)]
debian/ceph-base.dirs: create bootstrap-mgr dirs

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14824 from renhwztetecs/renhw-wip-mgr-bootstrap
Sage Weil [Thu, 27 Apr 2017 14:46:57 +0000 (09:46 -0500)]
Merge pull request #14824 from renhwztetecs/renhw-wip-mgr-bootstrap

mgr: mkdir bootstrap-mgr

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoqa: krbd write-after-checksum tests 14836/head
Ilya Dryomov [Wed, 26 Apr 2017 19:42:58 +0000 (21:42 +0200)]
qa: krbd write-after-checksum tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agomgr: do shutdown using finisher so we can do it in the right order 14835/head
Kefu Chai [Thu, 27 Apr 2017 12:37:35 +0000 (20:37 +0800)]
mgr: do shutdown using finisher so we can do it in the right order

otherwise we can shutdown a PyModules while it still being init'ed

Fixes: http://tracker.ceph.com/issues/19743
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings 14797/head
Willem Jan Withagen [Thu, 27 Apr 2017 13:58:36 +0000 (15:58 +0200)]
common/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14831 from smithfarm/wip-stress-split
Sage Weil [Thu, 27 Apr 2017 13:43:30 +0000 (08:43 -0500)]
Merge pull request #14831 from smithfarm/wip-stress-split

tests: fix broken links in upgrade/hammer-jewel-x/stress-split

8 years agorocksdb: sync with upstream 14818/head
Kefu Chai [Thu, 27 Apr 2017 03:04:35 +0000 (11:04 +0800)]
rocksdb: sync with upstream

to avoid warning with glibc 2.25, see
https://github.com/facebook/rocksdb/pull/2208 and
https://github.com/ceph/rocksdb/pull/17

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobuild/ops: cmake: explicitly disable MSSE 4.2 if not supported
Nathan Cutler [Thu, 27 Apr 2017 10:47:12 +0000 (12:47 +0200)]
build/ops: cmake: explicitly disable MSSE 4.2 if not supported

This became necessary when upstream unconditionally enabled MSSE 4.2
via https://github.com/facebook/rocksdb/commit/bc397325

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14751 from trociny/wip-19716
Jason Dillaman [Thu, 27 Apr 2017 12:25:01 +0000 (08:25 -0400)]
Merge pull request #14751 from trociny/wip-19716

test/librbd/test_notify.py: don't disable feature in slave

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agotests: fix broken links in upgrade/hammer-jewel-x/stress-split 14831/head
Nathan Cutler [Thu, 27 Apr 2017 12:03:04 +0000 (14:03 +0200)]
tests: fix broken links in upgrade/hammer-jewel-x/stress-split

Fixes: http://tracker.ceph.com/issues/19793
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #14820 from tchaikov/wip-deb-maint-fun
Kefu Chai [Thu, 27 Apr 2017 10:47:14 +0000 (18:47 +0800)]
Merge pull request #14820 from tchaikov/wip-deb-maint-fun

debian: package crypto plugin only on amd64

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agomon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap 14826/head
Kefu Chai [Thu, 27 Apr 2017 08:39:59 +0000 (16:39 +0800)]
mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomgr: mkdir bootstrap-mgr 14824/head
huanwen ren [Thu, 27 Apr 2017 08:21:02 +0000 (16:21 +0800)]
mgr: mkdir bootstrap-mgr

ceph-deploy rely on bootstrap-mgr
as follows: https://github.com/ceph/ceph-deploy/blob/master/ceph_deploy/mgr.py#L37

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
8 years agosrc/osd/ReplicatedBackend.cc: remove redundant assignments which have been done in... 14817/head
caijin.caij [Wed, 26 Apr 2017 09:50:46 +0000 (17:50 +0800)]
src/osd/ReplicatedBackend.cc: remove redundant assignments which have been done in constructor function

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>
8 years agodebian: package crypto plugins only on amd64 14820/head
Kefu Chai [Thu, 27 Apr 2017 05:25:58 +0000 (13:25 +0800)]
debian: package crypto plugins only on amd64

currently, only plugin based on isa-l is installed. archs other than
amd64 will not have this directory or the plugin(s) residing in it.
hence dh_install will fail when trying to copy nonexistence file/dir.

* debian/ceph-common.install: chmod +x, and only install crypto on amd64
  so dh_install can filter the install list using dh-exec
* debian/control: depends on dh-exec now. dh-exec v0.13 introduces support
  for filtering based on architecture. see dh-exec's changelog for more
  details. but trusty only offers dh-exec v0.12. so do not require ">=
  0.13) at this moment.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: os should depend on crypto_plugins not a certain plugin
Kefu Chai [Thu, 27 Apr 2017 05:28:12 +0000 (13:28 +0800)]
cmake: os should depend on crypto_plugins not a certain plugin

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocrypto: cleanup NSPR in main thread 14801/head
Kefu Chai [Wed, 26 Apr 2017 07:56:32 +0000 (15:56 +0800)]
crypto: cleanup NSPR in main thread

quote from nspr's header file

```
 * Perform a graceful shutdown of NSPR.  PR_Cleanup() may be called by
 * the primordial thread near the end of the main() function.
```

this helps to silence some warnings from valgrind. but it does not hurt
in practice, because the process is about to die. and the freed memory
chunks are only allocated once in NSPR.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoosdc/Objecter: more constness 14819/head
Kefu Chai [Wed, 26 Apr 2017 15:54:22 +0000 (23:54 +0800)]
osdc/Objecter: more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>