]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoosdc: build MOSDOp message in Objecter::_send_op 19994/head
runsisi [Thu, 18 Jan 2018 02:22:57 +0000 (10:22 +0800)]
osdc: build MOSDOp message in Objecter::_send_op

it's more intuitive and consistent

Signed-off-by: runsisi <runsisi@zte.com.cn>
7 years agoosdc: remove Objecter::kick_requests which is unused
runsisi [Thu, 18 Jan 2018 02:13:43 +0000 (10:13 +0800)]
osdc: remove Objecter::kick_requests which is unused

Signed-off-by: runsisi <runsisi@zte.com.cn>
7 years agoMerge pull request #20059 from ceph/wip-rm22427
Sage Weil [Tue, 23 Jan 2018 00:16:10 +0000 (18:16 -0600)]
Merge pull request #20059 from ceph/wip-rm22427

doc/ceph-volume OSD use the fsid file, not the osd_fsid

7 years agoMerge pull request #19979 from k0ste/prometheus_metadata
Sage Weil [Tue, 23 Jan 2018 00:15:34 +0000 (18:15 -0600)]
Merge pull request #19979 from k0ste/prometheus_metadata

mgr: prometheus: set metadata metrics value to '1' (#22717).

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #19980 from k0ste/prometheus_latency
Sage Weil [Tue, 23 Jan 2018 00:14:12 +0000 (18:14 -0600)]
Merge pull request #19980 from k0ste/prometheus_latency

mgr: prometheus: added osd commit/apply latency metrics (#22718).

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19986 from tchaikov/wip-denc-size-t-featured
Sage Weil [Mon, 22 Jan 2018 23:51:34 +0000 (17:51 -0600)]
Merge pull request #19986 from tchaikov/wip-denc-size-t-featured

denc: should check element's type not 'size_t'

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20028 from mogeb/steady-clock-rados
Sage Weil [Mon, 22 Jan 2018 23:51:02 +0000 (17:51 -0600)]
Merge pull request #20028 from mogeb/steady-clock-rados

rados: use WaitInterval()'s return value instead of manual timing

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20044 from tchaikov/wip-22419
Sage Weil [Mon, 22 Jan 2018 23:50:07 +0000 (17:50 -0600)]
Merge pull request #20044 from tchaikov/wip-22419

osd: update store with options after pg is created

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20032 from liewegas/wip-name-shadowing
Sage Weil [Mon, 22 Jan 2018 23:49:09 +0000 (17:49 -0600)]
Merge pull request #20032 from liewegas/wip-name-shadowing

mon/OSDMonitor: rename outer name declaration to avoid shadowing

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20015 from cbodley/wip-crypto--
Sage Weil [Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)]
Merge pull request #20015 from cbodley/wip-crypto--

crypto: remove cryptopp library

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20029 from tchaikov/wip-osx-build
Sage Weil [Mon, 22 Jan 2018 23:48:00 +0000 (17:48 -0600)]
Merge pull request #20029 from tchaikov/wip-osx-build

osdc,os,osd: fix build on osx

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20046 from tchaikov/wip-22711
Sage Weil [Mon, 22 Jan 2018 23:46:30 +0000 (17:46 -0600)]
Merge pull request #20046 from tchaikov/wip-22711

test: reduce the chance to have degraded PGs

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc/ceph-volume OSD use the fsid file, not the osd_fsid 20059/head
Alfredo Deza [Mon, 22 Jan 2018 20:16:40 +0000 (15:16 -0500)]
doc/ceph-volume OSD use the fsid file, not the osd_fsid

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #19960 from gohighsec/default_bluestore
Alfredo Deza [Mon, 22 Jan 2018 19:42:58 +0000 (14:42 -0500)]
Merge pull request #19960 from gohighsec/default_bluestore

doc: update man page to explain ceph-volume support bluestore

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20034 from linuxbox2/wip-rgw-altlatchfix
Matt Benjamin [Mon, 22 Jan 2018 18:50:39 +0000 (13:50 -0500)]
Merge pull request #20034 from linuxbox2/wip-rgw-altlatchfix

rgw_file: alternate fix deadlock on lru eviction

7 years agoMerge pull request #20030 from tchaikov/wip-doc-cxx11
Sage Weil [Mon, 22 Jan 2018 16:49:14 +0000 (10:49 -0600)]
Merge pull request #20030 from tchaikov/wip-doc-cxx11

doc/dev/cxx: add C++11 ABI related doc

7 years agoMerge pull request #19708 from qrGitHub/wip-rgw-unused-variable4
Casey Bodley [Mon, 22 Jan 2018 15:16:03 +0000 (10:16 -0500)]
Merge pull request #19708 from qrGitHub/wip-rgw-unused-variable4

rgw: drop unused variable bucket_instance_ids

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18717 from shinobu-x/sk_mgr_daemonserver_using_get_val
John Spray [Mon, 22 Jan 2018 14:30:26 +0000 (14:30 +0000)]
Merge pull request #18717 from shinobu-x/sk_mgr_daemonserver_using_get_val

mgr/DaemonServer.cc: [Cleanup] Change to using  get_val template function

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19362 from myoungwon/wip-manifest-rados-op-promote
Sage Weil [Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)]
Merge pull request #19362 from myoungwon/wip-manifest-rados-op-promote

osd, librados: add a rados op (TIER_PROMOTE)

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20045 from shangzhong/doc-cephfs-multimds
John Spray [Mon, 22 Jan 2018 14:20:40 +0000 (14:20 +0000)]
Merge pull request #20045 from shangzhong/doc-cephfs-multimds

doc: redundant "cephfs" when set the "allow_multimds"

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19744 from jan--f/mgr-prometheus-standby-mondown
John Spray [Mon, 22 Jan 2018 13:29:48 +0000 (13:29 +0000)]
Merge pull request #19744 from jan--f/mgr-prometheus-standby-mondown

pybind/mgr/prometheus: add StandbyModule and handle failed MON cluster

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agotest: reduce the chance to have degraded PGs 20046/head
Kefu Chai [Mon, 22 Jan 2018 12:42:48 +0000 (20:42 +0800)]
test: reduce the chance to have degraded PGs

in test_mon_osd_misc(), there is good chance that the cluster chooses
to use an unbalanced weight because of the data distribution at that moment.
but this setting could prevent the CRUSH from choosing enough number of
OSDs for test_mon_cephdf_commands(), where 32 PGs are to be created. so
it's more likely that the CRUSH fails to pick enough OSDs for all PGs.
that's why we have a curr_object_copies_rate = 0.5.

so, in this change, pg=pgp=1 is specified for the new pool.

Fixes: http://tracker.ceph.com/issues/22711
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/tasks/mgr: add test_prometheus; smoke tests for prometheus module 19744/head
Jan Fajerski [Sat, 13 Jan 2018 16:25:58 +0000 (17:25 +0100)]
qa/tasks/mgr: add test_prometheus; smoke tests for prometheus module

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agopybing/mgr/prometheus: tidy up cherrypy engine start and stop
Jan Fajerski [Thu, 30 Nov 2017 10:27:04 +0000 (11:27 +0100)]
pybing/mgr/prometheus: tidy up cherrypy engine start and stop

Calling cherrypy.engine.block() in the stanby module results in a failing
mgr failover.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #19965 from ovh/bp-reorder-mimic-fields
Kefu Chai [Mon, 22 Jan 2018 11:58:50 +0000 (19:58 +0800)]
Merge pull request #19965 from ovh/bp-reorder-mimic-fields

osd_types.cc: reorder fields in serialized pg_stat_t

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19963 from runsisi/wip-cmake
Kefu Chai [Mon, 22 Jan 2018 11:58:24 +0000 (19:58 +0800)]
Merge pull request #19963 from runsisi/wip-cmake

cmake: do not find bzip2/lz4 for rocksdb

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19944 from badone/wip-better-prepare_command_pool_set-E2BIG-error...
Kefu Chai [Mon, 22 Jan 2018 11:58:01 +0000 (19:58 +0800)]
Merge pull request #19944 from badone/wip-better-prepare_command_pool_set-E2BIG-error-message

mon/OSDMonitor: Better prepare_command_pool_set E2BIG error message

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19934 from david-z/wip-rocksdb-dump-mem
Kefu Chai [Mon, 22 Jan 2018 11:57:24 +0000 (19:57 +0800)]
Merge pull request #19934 from david-z/wip-rocksdb-dump-mem

kv/RocksDB: get index and filter blocks memory usage

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: redundant "cephfs" when set the "allow_multimds" 20045/head
Shangzhong Zhu [Mon, 22 Jan 2018 11:46:16 +0000 (19:46 +0800)]
doc: redundant "cephfs" when set the "allow_multimds"

Signed-off-by: Shangzhong Zhu <zhu.shangzhong@zte.com.cn>
7 years agoMerge pull request #19948 from tchaikov/wip-standby-module-get-config
John Spray [Mon, 22 Jan 2018 10:53:49 +0000 (10:53 +0000)]
Merge pull request #19948 from tchaikov/wip-standby-module-get-config

pybind/mgr/mgr_module: add default param for MgrStandbyModule.get_con…

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agopybind/mgr/mgr_module: add default param for MgrStandbyModule.get_config() 19948/head
Kefu Chai [Mon, 15 Jan 2018 03:49:08 +0000 (11:49 +0800)]
pybind/mgr/mgr_module: add default param for MgrStandbyModule.get_config()

this matches its counterpart of MgrModule.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19863 from renhwztetecs/renhw-wip-common-time
Kefu Chai [Mon, 22 Jan 2018 08:38:24 +0000 (16:38 +0800)]
Merge pull request #19863 from renhwztetecs/renhw-wip-common-time

common/time: add time.h for Alpine build

Reviewed-by: John Coyle <dx9err@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19899 from smithfarm/wip-rip-rcceph
Kefu Chai [Mon, 22 Jan 2018 08:36:23 +0000 (16:36 +0800)]
Merge pull request #19899 from smithfarm/wip-rip-rcceph

build/ops: rpm: rip out rcceph script

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: update store with options after pg is created 20044/head
Kefu Chai [Mon, 22 Jan 2018 05:08:48 +0000 (13:08 +0800)]
osd: update store with options after pg is created

Fixes: http://tracker.ceph.com/issues/22419
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoRevert "osd/PG: pass pool options to ObjectStore on pg create"
Kefu Chai [Mon, 22 Jan 2018 05:03:53 +0000 (13:03 +0800)]
Revert "osd/PG: pass pool options to ObjectStore on pg create"

pg is not created by the underlying store, hence the
osd->store->set_collection_opts() call always returns -ENOENT.

This reverts commit 37d7fd3b21cab055721504e1546c6b1657a400af.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: print a space after __func__ in log message
Kefu Chai [Mon, 22 Jan 2018 05:02:40 +0000 (13:02 +0800)]
osd/PG: print a space after __func__ in log message

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19998 from liewegas/wip-22715
Sage Weil [Sun, 21 Jan 2018 20:29:40 +0000 (14:29 -0600)]
Merge pull request #19998 from liewegas/wip-22715

fix broken use of streamstream::rdbuf()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agorgw_file: alternate fix deadlock on lru eviction 20034/head
Matt Benjamin [Fri, 19 Jan 2018 18:05:27 +0000 (13:05 -0500)]
rgw_file: alternate fix deadlock on lru eviction

This change is an alternate fix for two problems found and fixed
by Yao Zongyou <yaozongyou@vip.qq.com>.

The deadlock can be avoided just by not taking it in the recycle
case, which invariantly holds the lock.

The invalidation of the insert iterator by the recyle-path unlink
we'd like to handle as a condition in order to preserve the cached
insertion point optimization we get in the common case.  (The
original behavior was, indeed, incorrect.)

Based on feedback from Yao, removed the RGWFileHandle dtor version
of the unlink check, which I think happened twice.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #19597 from joscollin/wip-lspools-output 20361/head
Gregory Farnum [Fri, 19 Jan 2018 18:01:38 +0000 (10:01 -0800)]
Merge pull request #19597 from joscollin/wip-lspools-output

mon: align lspools output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #19936 from linuxbox2/wip-rgw-22121
Matt Benjamin [Fri, 19 Jan 2018 17:23:44 +0000 (12:23 -0500)]
Merge pull request #19936 from linuxbox2/wip-rgw-22121

rgw: URL-decode S3 and Swift object-copy URLs

7 years agoMerge pull request #20019 from zhouyuan/fix_librbdpy_example
Kefu Chai [Fri, 19 Jan 2018 15:43:22 +0000 (23:43 +0800)]
Merge pull request #20019 from zhouyuan/fix_librbdpy_example

doc: fix librbdpy example

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agodoc/dev/cxx: add C++11 ABI related doc 20030/head
Kefu Chai [Fri, 19 Jan 2018 13:13:37 +0000 (21:13 +0800)]
doc/dev/cxx: add C++11 ABI related doc

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19577 from vshankar/wip-policy-state-machine-rollback
Jason Dillaman [Fri, 19 Jan 2018 15:33:18 +0000 (10:33 -0500)]
Merge pull request #19577 from vshankar/wip-policy-state-machine-rollback

rbd-mirror: rollback state transitions in image policy

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19821 from trociny/wip-nbd-global-options
Jason Dillaman [Fri, 19 Jan 2018 15:33:05 +0000 (10:33 -0500)]
Merge pull request #19821 from trociny/wip-nbd-global-options

rbd: properly pass ceph global command line args to subprocess

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19912 from adamemerson/wip-minimax-rbd
Jason Dillaman [Fri, 19 Jan 2018 15:32:52 +0000 (10:32 -0500)]
Merge pull request #19912 from adamemerson/wip-minimax-rbd

librbd: prefer templates to macros

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19937 from trociny/wip-rbd-showmapped
Jason Dillaman [Fri, 19 Jan 2018 15:32:39 +0000 (10:32 -0500)]
Merge pull request #19937 from trociny/wip-rbd-showmapped

rbd: adjusted "showmapped" JSON and XML formatted output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocommon: remove typedef for byte 20015/head
Casey Bodley [Thu, 18 Jan 2018 01:43:38 +0000 (20:43 -0500)]
common: remove typedef for byte

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocommon: remove cryptopp digest impls
Casey Bodley [Thu, 18 Jan 2018 01:42:46 +0000 (20:42 -0500)]
common: remove cryptopp digest impls

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: remove cryptopp BlockCrypt impls
Casey Bodley [Thu, 18 Jan 2018 01:35:54 +0000 (20:35 -0500)]
rgw: remove cryptopp BlockCrypt impls

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoauth: remove cryptopp CryptoKeyHandler impl
Casey Bodley [Thu, 18 Jan 2018 01:26:55 +0000 (20:26 -0500)]
auth: remove cryptopp CryptoKeyHandler impl

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocmake: remove cryptopp option
Casey Bodley [Thu, 18 Jan 2018 01:23:14 +0000 (20:23 -0500)]
cmake: remove cryptopp option

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19972 from liewegas/wip-mgr-rados
John Spray [Fri, 19 Jan 2018 13:38:51 +0000 (13:38 +0000)]
Merge pull request #19972 from liewegas/wip-mgr-rados

pybind/mgr/mgr_module: make rados handle available to all modules

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomon/OSDMonitor: rename outer name declaration to avoid shadowing 20032/head
Sage Weil [Fri, 19 Jan 2018 13:26:52 +0000 (07:26 -0600)]
mon/OSDMonitor: rename outer name declaration to avoid shadowing

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdc,os,osd: fix build on osx 20029/head
Kefu Chai [Fri, 19 Jan 2018 13:09:35 +0000 (21:09 +0800)]
osdc,os,osd: fix build on osx

on clang on MacOS, size_t is not identical to uint64_t, so we need to do
specify the template parameter if the two parameters' types are
different.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: fix librbdpy example 20019/head
Yuan Zhou [Fri, 19 Jan 2018 02:41:03 +0000 (10:41 +0800)]
doc: fix librbdpy example

need to connect cluster before opening ioctx

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
7 years agorgw: URL-decode S3 and Swift object-copy URLs 19936/head
Matt Benjamin [Fri, 12 Jan 2018 15:12:16 +0000 (10:12 -0500)]
rgw: URL-decode S3 and Swift object-copy URLs

Fixes: http://tracker.ceph.com/issues/22121
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge PR #20011 into master
Patrick Donnelly [Thu, 18 Jan 2018 19:59:53 +0000 (11:59 -0800)]
Merge PR #20011 into master

* refs/pull/20011/head:
mds: fix some typo

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18971 from liewegas/wip-pg-scrub-preempt
Sage Weil [Thu, 18 Jan 2018 18:37:48 +0000 (12:37 -0600)]
Merge pull request #18971 from liewegas/wip-pg-scrub-preempt

osd/PG: allow scrub preemption

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #19476 from qrGitHub/wip-rgw-lack-timeSkewCheck
Yuri Weinstein [Thu, 18 Jan 2018 18:01:17 +0000 (10:01 -0800)]
Merge pull request #19476 from qrGitHub/wip-rgw-lack-timeSkewCheck

rgw: add time skew check in function parse_v4_auth_header

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19826 from joke-lee/rgw_fix_s3website_redirect_location_string_length
Yuri Weinstein [Thu, 18 Jan 2018 17:59:42 +0000 (09:59 -0800)]
Merge pull request #19826 from joke-lee/rgw_fix_s3website_redirect_location_string_length

rgw: fix s3website redirect location string length

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19918 from fangyuxiangGL/lc-omap
Yuri Weinstein [Thu, 18 Jan 2018 17:59:17 +0000 (09:59 -0800)]
Merge pull request #19918 from fangyuxiangGL/lc-omap

rgw: abort multipart if upload meta object doesn't exist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20003 from wjwithagen/fix-PG-protected
Sage Weil [Thu, 18 Jan 2018 17:47:13 +0000 (11:47 -0600)]
Merge pull request #20003 from wjwithagen/fix-PG-protected

common: change routines to public access

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: squelch 'id' arg errors 19998/head
Sage Weil [Wed, 17 Jan 2018 17:23:39 +0000 (11:23 -0600)]
mon/OSDMonitor: squelch 'id' arg errors

Several commands use 'id' but for other types (e.g., vector<int64_t>).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agouse stringsream::str(), not rdbuf()
Sage Weil [Wed, 17 Jan 2018 17:22:55 +0000 (11:22 -0600)]
use stringsream::str(), not rdbuf()

Fixes: http://tracker.ceph.com/issues/22715
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorados: use WaitInterval()'s return value instead of manual timing 20028/head
Mohamad Gebai [Mon, 4 Dec 2017 12:44:40 +0000 (07:44 -0500)]
rados: use WaitInterval()'s return value instead of manual timing

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
7 years agoMerge pull request #19949 from ceph/wip-bz1498521
Alfredo Deza [Thu, 18 Jan 2018 13:49:53 +0000 (08:49 -0500)]
Merge pull request #19949 from ceph/wip-bz1498521

ceph-volume: adds --crush-device-class flag for lvm prepare and create

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19997 from Songweibin/wip-fix-typo
Jason Dillaman [Thu, 18 Jan 2018 13:46:30 +0000 (08:46 -0500)]
Merge pull request #19997 from Songweibin/wip-fix-typo

doc/rbd: fix typo s/morror/mirror

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19981 from k0ste/dashboard_iops
John Spray [Thu, 18 Jan 2018 12:46:30 +0000 (12:46 +0000)]
Merge pull request #19981 from k0ste/dashboard_iops

mgr: dashboard: show per pool IOPS on health page (#22495).

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomgr: dashboard: show per pool IOPS on health page (#22495). 19981/head
Konstantin Shalygin [Wed, 17 Jan 2018 06:59:41 +0000 (13:59 +0700)]
mgr: dashboard: show per pool IOPS on health page (#22495).

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
7 years agocommon: change routines to public access 20003/head
Willem Jan Withagen [Thu, 18 Jan 2018 10:46:01 +0000 (11:46 +0100)]
common: change routines to public access

Clang complains tafter recent changes:
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8787:8: error: 'DeleteStart' is a protected member of 'PG'
          PG::DeleteStart())));
              ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1870:16: note: declared protected here
  TrivialEvent(DeleteStart)
               ^
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:9136:6: error: 'DeleteSome' is a protected member of 'PG'
        PG::DeleteSome())),
            ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1871:16: note: declared protected here
  TrivialEvent(DeleteSome)
               ^
2 errors generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agomgr: prometheus: added osd commit/apply latency metrics (#22718). 19980/head
Konstantin Shalygin [Wed, 17 Jan 2018 06:40:05 +0000 (13:40 +0700)]
mgr: prometheus: added osd commit/apply latency metrics (#22718).

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
7 years agodoc/rbd: fix typo s/morror/mirror 19997/head
songweibin [Thu, 18 Jan 2018 03:36:32 +0000 (11:36 +0800)]
doc/rbd: fix typo s/morror/mirror

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge pull request #19931 from mikechristie/wip-doc-mnc-iscsi-updates
John Wilkins [Wed, 17 Jan 2018 19:00:08 +0000 (11:00 -0800)]
Merge pull request #19931 from mikechristie/wip-doc-mnc-iscsi-updates

Misc iSCSI doc updates

Reviewed-by: John Wilkins <jowilkin@redhat.com>
7 years agoceph-volume: print the lvm activate success message correctly 19949/head
Andrew Schoen [Wed, 17 Jan 2018 17:44:10 +0000 (11:44 -0600)]
ceph-volume: print the lvm activate success message correctly

Move the terminal.success to the methods that have access to the
correct osd_id so that they do not print None for the osd_id
in the log message.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #17520 from joscollin/wip-cleanup-drop-return
Casey Bodley [Wed, 17 Jan 2018 15:18:07 +0000 (10:18 -0500)]
Merge pull request #17520 from joscollin/wip-cleanup-drop-return

rgw: Drop unnecessary return

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agodenc: should check element's type not 'size_t' 19986/head
Kefu Chai [Wed, 17 Jan 2018 13:25:05 +0000 (21:25 +0800)]
denc: should check element's type not 'size_t'

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorbd: properly pass ceph global command line args to subprocess 19821/head
Mykola Golub [Sun, 7 Jan 2018 11:08:06 +0000 (13:08 +0200)]
rbd: properly pass ceph global command line args to subprocess

When initializing the global context, global_init parses command line
arguments and removes ceph global args from the list. As a result they
are not visible for rbd command line parser and global options were
ignored when passing them to subprocesses like nbd or ggate.

Fix this by keeping a list of ceph global init command line
arguments. To build the list we compare the list of initial command
line args and those that remain after global_init parsing.

After this fix it is possible to pass any ceph global option to a
subprocess.

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agomgr: prometheus: set metadata metrics value to '1' (#22717). 19979/head
Konstantin Shalygin [Wed, 17 Jan 2018 06:23:46 +0000 (13:23 +0700)]
mgr: prometheus: set metadata metrics value to '1' (#22717).

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
7 years agoMerge PR #19803 into master
Patrick Donnelly [Wed, 17 Jan 2018 04:06:37 +0000 (20:06 -0800)]
Merge PR #19803 into master

* refs/pull/19803/head:
mds: get rid of unnecessary if condition

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #19837 into master
Patrick Donnelly [Wed, 17 Jan 2018 04:06:31 +0000 (20:06 -0800)]
Merge PR #19837 into master

* refs/pull/19837/head:
client: avoid recursive lock in ll_get_vino

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agoMerge PR #19860 into master
Patrick Donnelly [Wed, 17 Jan 2018 04:06:26 +0000 (20:06 -0800)]
Merge PR #19860 into master

* refs/pull/19860/head:
cephfs-journal-tool: add usage help info for header set <field>
mds: add error log info
cephfs-journal-tool: add "set pool_id" option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19891 into master
Patrick Donnelly [Wed, 17 Jan 2018 04:06:21 +0000 (20:06 -0800)]
Merge PR #19891 into master

* refs/pull/19891/head:
mds: handle 'inode gets queued for recovery multiple times'
mds: use elist to track recover queue items

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19911 into master
Patrick Donnelly [Wed, 17 Jan 2018 04:06:12 +0000 (20:06 -0800)]
Merge PR #19911 into master

* refs/pull/19911/head:
cephfs: Switch MIN/MAX for std::min/max and use intarith templates

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd/PG: drop 'seed' property from Scrubber 18971/head
Sage Weil [Thu, 11 Jan 2018 22:37:00 +0000 (16:37 -0600)]
osd/PG: drop 'seed' property from Scrubber

This has been -1 for many releases now.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/singleton/all/divergent_priors*: unsquelch osd debug
Sage Weil [Wed, 3 Jan 2018 20:29:55 +0000 (14:29 -0600)]
qa/suites/rados/singleton/all/divergent_priors*: unsquelch osd debug

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ECBackend: debug ec scrub error paths
Sage Weil [Wed, 3 Jan 2018 20:19:35 +0000 (14:19 -0600)]
osd/ECBackend: debug ec scrub error paths

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: document scrub options
Sage Weil [Thu, 28 Dec 2017 23:27:43 +0000 (17:27 -0600)]
osd: document scrub options

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: allow limited scrub preemption
Sage Weil [Fri, 5 Jan 2018 14:35:34 +0000 (08:35 -0600)]
osd: allow limited scrub preemption

If we receive a write within the scrub range, abort the scrub chunk and
shrink the chunk size.  If we do this too many times do not preempt and
allow the scrub to complete (to avoid scrub starvation due to client io).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-volume: update argument description that bluestore is the default 19960/head
lijing [Wed, 17 Jan 2018 02:20:11 +0000 (10:20 +0800)]
ceph-volume: update argument description that bluestore is the default

Fixes: http://tracker.ceph.com/issues/22663
Signed-off-by: Jing Li lijing@gohighsec.com
7 years agodoc: update man page to explain ceph-volume support bluestore
lijing [Wed, 17 Jan 2018 02:18:59 +0000 (10:18 +0800)]
doc: update man page to explain ceph-volume support bluestore

Fixes: http://tracker.ceph.com/issues/22663
Signed-off-by: Jing Li lijing@gohighsec.com
7 years agoMerge pull request #19876 from theanalyst/build/do-cmake-args
Kefu Chai [Wed, 17 Jan 2018 01:50:26 +0000 (09:50 +0800)]
Merge pull request #19876 from theanalyst/build/do-cmake-args

build: do_cmake: allow ARGS to be overridden

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19433 from liewegas/wip-pg-removal
Sage Weil [Tue, 16 Jan 2018 21:44:27 +0000 (15:44 -0600)]
Merge pull request #19433 from liewegas/wip-pg-removal

osd: put pg removal in op_wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agopybind/mgr/mgr_module: make rados handle available to all modules 19972/head
Sage Weil [Tue, 16 Jan 2018 21:02:14 +0000 (15:02 -0600)]
pybind/mgr/mgr_module: make rados handle available to all modules

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do on_shutdown on removal 19433/head
Sage Weil [Fri, 12 Jan 2018 19:26:16 +0000 (13:26 -0600)]
osd/PrimaryLogPG: do on_shutdown on removal

This cleans up our reservations and misc other state in OSDService that
needs to be cleaned up.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: track deleted pools' pg_nums for calculating split
Sage Weil [Tue, 9 Jan 2018 21:18:58 +0000 (15:18 -0600)]
osd: track deleted pools' pg_nums for calculating split

This is needed to determine (quickly) whether PGs have split.  Calling
get_pg_num() on the latest map does not work when the pool has been
deleted from that map.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19850 from dzafman/wip-calc-stats
David Zafman [Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)]
Merge pull request #19850 from dzafman/wip-calc-stats

osd/PG: re-write of _update_calc_stats and improve pg degraded state

Fixes: http://tracker.ceph.com/issues/20059
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agotests: recovery-unfound-found test needs to account for correct misplaced calculations 19850/head
David Zafman [Tue, 16 Jan 2018 18:44:29 +0000 (10:44 -0800)]
tests: recovery-unfound-found test needs to account for correct misplaced calculations

The test expected HEALTH_OK when in a state with misplaced objects therefore HEALTH_WARN

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agodoc: add rbd pool requirement for gwcli 19931/head
Mike Christie [Tue, 16 Jan 2018 18:46:09 +0000 (12:46 -0600)]
doc: add rbd pool requirement for gwcli

Signed-off-by: Mike Christie <mchristi@redhat.com>
7 years agodoc: add daemon-reload for rbd-target-api setup
Mike Christie [Mon, 15 Jan 2018 18:59:37 +0000 (12:59 -0600)]
doc: add daemon-reload for rbd-target-api setup

Signed-off-by: Mike Christie <mchristi@redhat.com>
7 years agodoc: add gwcli manual install instructions
Mike Christie [Tue, 16 Jan 2018 18:04:28 +0000 (12:04 -0600)]
doc: add gwcli manual install instructions

Signed-off-by: Mike Christie <mchristi@redhat.com>