]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Alfredo Deza [Fri, 2 Feb 2018 14:08:23 +0000 (09:08 -0500)]
ceph-volume tests.functional add simple bluestore dmcrypt luks support
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:36:45 +0000 (08:36 -0500)]
doc/ceph-volume lvm prepare fully supports encryption now
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:36:02 +0000 (08:36 -0500)]
doc/ceph-volume scan update for encryption support
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:28:40 +0000 (08:28 -0500)]
doc/ceph-volume remove notice that dmcrypt is not supported
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:26:58 +0000 (08:26 -0500)]
doc/man/ceph-volume add simple documentation
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:15:36 +0000 (08:15 -0500)]
ceph-volume simple.scan update help menu to indicate device support
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:13:12 +0000 (08:13 -0500)]
ceph-volume tests for keyring parsing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:12:51 +0000 (08:12 -0500)]
ceph-volume tests for validate_devices
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 2 Feb 2018 13:12:05 +0000 (08:12 -0500)]
ceph-volume simple.activate b64decode keys for activation as well
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 21:17:19 +0000 (16:17 -0500)]
ceph-volume tests add validation for lsblk parsers
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:51:41 +0000 (15:51 -0500)]
ceph-volume tests validate parsing of cryptsetup
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:51:12 +0000 (15:51 -0500)]
ceph-volume tests add a stub for process.call
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:35:11 +0000 (15:35 -0500)]
ceph-volume util.encryption add notes about extra b64decode call for ceph-disk
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:34:09 +0000 (15:34 -0500)]
ceph-volume util.encryption parse legacy encrypted with dirs too
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:32:54 +0000 (15:32 -0500)]
ceph-volume terminal create a logger to get terminal+log messages in one call
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:32:16 +0000 (15:32 -0500)]
ceph-volume simple.activate support dmcrypted devices for both plain and luks
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 1 Feb 2018 20:31:28 +0000 (15:31 -0500)]
ceph-volume simple.scan parse the keyring out of the keyring file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 30 Jan 2018 21:23:06 +0000 (16:23 -0500)]
ceph-volume simple.scan support dmcrypt OSDs when scanning
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 30 Jan 2018 14:35:53 +0000 (09:35 -0500)]
ceph-volume util.encryption add a utilty to open plain encrypted devices
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 30 Jan 2018 14:34:53 +0000 (09:34 -0500)]
ceph-volume util.system tmp mounts can now remove a dmcrypt mapper
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 30 Jan 2018 14:22:19 +0000 (09:22 -0500)]
ceph-volume util.system do not 'translate' using realpath
Using realpath always means that device mapper paths, like for dmcrypt
or LVM will get mangled and will return something like `/dev/dm-1` which
is not useful for anything in ceph-volume
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 30 Jan 2018 14:19:06 +0000 (09:19 -0500)]
ceph-volume util.disk add a PART_ENTRY_TYPE detection utility
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 26 Jan 2018 15:44:14 +0000 (10:44 -0500)]
ceph-volume util.encryption add helpers for legacy devices
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 26 Jan 2018 15:25:31 +0000 (10:25 -0500)]
ceph-volume util.constants add ceph-disk partition labels
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 25 Jan 2018 16:04:15 +0000 (11:04 -0500)]
ceph-volume util.disk support PKNAME and absolute paths in lsblk
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 22 Jan 2018 19:21:37 +0000 (14:21 -0500)]
doc/ceph-volume add lvm/encryption to the index
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 22 Jan 2018 17:11:32 +0000 (12:11 -0500)]
doc/man/ceph-volume add dmcrypt support
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 22 Jan 2018 17:06:25 +0000 (12:06 -0500)]
doc/man/ceph-volume add docs for zap sub-command
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 22 Jan 2018 17:03:18 +0000 (12:03 -0500)]
doc/man/ceph-volume add docs for list sub-command
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 22 Jan 2018 16:41:32 +0000 (11:41 -0500)]
doc/dev/ceph-volume update internal LVM metadata information
Includes dmcrypt information, and updated key names to reflect current
code
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 16:12:52 +0000 (11:12 -0500)]
ceph-volume tests.functional add xenial filestore tests for dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 16:12:40 +0000 (11:12 -0500)]
ceph-volume tests.functional add xenial bluestore tests for dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 16:08:25 +0000 (11:08 -0500)]
ceph-volume tests.functional add dmcrypt support in tox.ini
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 16:03:58 +0000 (11:03 -0500)]
ceph-volume tests.functional add centos7 filestore tests for dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 15:45:32 +0000 (10:45 -0500)]
ceph-volume tests.functional add centos7 bluestore tests for dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 14:58:36 +0000 (09:58 -0500)]
ceph-volume tests add util.prepare unit tests
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 19 Jan 2018 14:58:18 +0000 (09:58 -0500)]
ceph-volume tests add fixture helpers for call and run
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 18 Jan 2018 21:37:00 +0000 (16:37 -0500)]
ceph-volume util allow prepare module to work with encryption keys
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 18 Jan 2018 21:22:06 +0000 (16:22 -0500)]
ceph-volume lvm.activate allow encryption setups for luks
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 18 Jan 2018 21:19:26 +0000 (16:19 -0500)]
ceph-volume lvm.prepare allow encryption setups for luks
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 18 Jan 2018 19:46:42 +0000 (14:46 -0500)]
ceph-volume process allow silencing output on file logging for sensitive data
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 18 Jan 2018 19:29:53 +0000 (14:29 -0500)]
ceph-volume util create a helper module for encryption
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Tue, 16 Jan 2018 14:02:31 +0000 (09:02 -0500)]
ceph-volume lvm.common add dmcrypt flag
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 11 Jan 2018 14:02:03 +0000 (09:02 -0500)]
doc/ceph-volume create an encryption doc explaining dmcrypt workflows
Signed-off-by: Alfredo Deza <adeza@redhat.com>
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>
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>