]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Willem Jan Withagen [Tue, 25 Sep 2018 21:36:30 +0000 (23:36 +0200)]
common: fix missing include boost/noncopyable.hpp
Clang complains:
```
In file included from /home/jenkins/workspace/ceph-master/src/osd/ReplicatedBackend.cc:15:
In file included from /home/jenkins/workspace/ceph-master/src/osd/ReplicatedBackend.h:18:
In file included from /home/jenkins/workspace/ceph-master/src/osd/PGBackend.h:27:
In file included from /home/jenkins/workspace/ceph-master/src/osd/PGTransaction.h:25:
/home/jenkins/workspace/ceph-master/src/common/inline_variant.h:88:64: error: expected class name
struct generic_visitor : boost::static_visitor<Result>, boost::noncopyable
^
1 error generated.
gmake[2]: *** [src/osd/CMakeFiles/osd.dir/build.make:141: src/osd/CMakeFiles/osd.dir/ReplicatedBackend.cc.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
```
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit
0654099d4b2f9f9423d7e8cf00e9e3351a24ec67 )
Yuri Weinstein [Mon, 4 Feb 2019 20:49:18 +0000 (12:49 -0800)]
Merge pull request #26009 from sebastian-philipp/dashboard-mirror_mode
mimic: mgr/dashboard: Set mirror_mode to None
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Yuri Weinstein [Mon, 4 Feb 2019 20:47:00 +0000 (12:47 -0800)]
Merge pull request #26208 from vumrao/wip-vumrao-38107
mimic: mgr/DaemonServer: log pgmap usage to cluster log
Reviewed-by: Neha Ojha <nojha@redhat.com>
Neha Ojha [Thu, 24 Jan 2019 03:25:12 +0000 (19:25 -0800)]
mgr/DaemonServer: log pgmap usage to cluster log
- change default of mon_cluster_log_file_level to debug
- log to clog->debug()
Fixes: https://tracker.ceph.com/issues/37886
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
f64a69e5054fb319e9f717bbcb7ddd8541e01c6f )
Conflicts:
src/common/options.cc
dropped master .add_service, .add_see_also
Yuri Weinstein [Wed, 30 Jan 2019 17:07:36 +0000 (09:07 -0800)]
Merge pull request #25306 from trociny/wip-37437-mimic
mimic: crushtool: add --reclassify operation to convert legacy crush maps to use device classes
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:06:04 +0000 (09:06 -0800)]
Merge pull request #25313 from pdvian/wip-36639-mimic
mimic: os/bluestore: rename does not old ref to replacement onode at old name
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:04:26 +0000 (09:04 -0800)]
Merge pull request #25526 from smithfarm/wip-36753-mimic
mimic: mon: log last command skips latest entry
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:03:47 +0000 (09:03 -0800)]
Merge pull request #25603 from smithfarm/wip-37686-mimic
mimic: core: list-inconsistent-obj output truncated, causing osd-scrub-repair.sh failure
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:03:10 +0000 (09:03 -0800)]
Merge pull request #25694 from joscollin/wip-37624-mimic
mimic: pybind/mgr/status: fix ceph fs status in py3 environments.
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:02:01 +0000 (09:02 -0800)]
Merge pull request #25708 from joscollin/wip-37755-mimic
mimic: osd/PrimaryLogPG: fix the extent length error of the sync read
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Wed, 30 Jan 2019 17:01:19 +0000 (09:01 -0800)]
Merge pull request #25822 from batrick/i36209
mimic: mds: runs out of file descriptors after several respawns
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 17:00:26 +0000 (09:00 -0800)]
Merge pull request #25852 from ashishkumsingh/wip-37832-mimic
mimic: objecter: avoid race when reset down osd's session
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:57:45 +0000 (08:57 -0800)]
Merge pull request #26128 from xiexingguo/wip-mimic-upmap-fixes
mimic: osd: backport recent upmap fixes
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:56:34 +0000 (08:56 -0800)]
Merge pull request #26147 from ashishkumsingh/wip-38045-mimic
mimic: tests: qa/overrides/short_pg_log.yaml: reduce osd_{min,max}_pg_log_entries
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:52:27 +0000 (08:52 -0800)]
Merge pull request #25413 from tombarron/mimic
mimic: ceph-volume-client: allow setting mode of CephFS volumes
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:52:01 +0000 (08:52 -0800)]
Merge pull request #25515 from smithfarm/wip-36578-mimic
mimic: qa: teuthology may hang on diagnostic commands for fuse mount
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:51:35 +0000 (08:51 -0800)]
Merge pull request #25517 from smithfarm/wip-37424-mimic
mimic: qa: wrong setting for msgr failures
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:51:07 +0000 (08:51 -0800)]
Merge pull request #25519 from smithfarm/wip-37603-mimic
mimic: mds: severe internal fragment when decoding xattr_map from log event
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:50:08 +0000 (08:50 -0800)]
Merge pull request #25521 from smithfarm/wip-37607-mimic
mimic: mds: directories pinned keep being replicated back and forth between exporting mds and importing mds
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:49:38 +0000 (08:49 -0800)]
Merge pull request #25523 from smithfarm/wip-37605-mimic
mimic: mds: PurgeQueue write error handler does not handle EBLACKLISTED
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:49:09 +0000 (08:49 -0800)]
Merge pull request #25557 from smithfarm/wip-37611-mimic
mimic: qa: pjd test appears to require more than 3h timeout for some configurations
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:48:41 +0000 (08:48 -0800)]
Merge pull request #25559 from smithfarm/wip-37626-mimic
mimic: mds: fix incorrect l_pq_executing_ops statistics when meet an invalid item in purge queue
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:47:23 +0000 (08:47 -0800)]
Merge pull request #25561 from smithfarm/wip-37628-mimic
mimic: mds: do not call Journaler::_trim twice
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:46:48 +0000 (08:46 -0800)]
Merge pull request #25642 from vshankar/wip-37609
mimic: mds: disallow dumping huge caches to formatter
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:46:18 +0000 (08:46 -0800)]
Merge pull request #25676 from joscollin/wip-37699-mimic
mimic: mds: fix bug filelock stuck at LOCK_XSYN leading client can't read data
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:45:35 +0000 (08:45 -0800)]
Merge pull request #25678 from joscollin/wip-37695-mimic
mimic: client: fix failure in quota size limitation when using samba
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)]
Merge pull request #25680 from joscollin/wip-37634-mimic
mimic: mds: fix races of updating wanted caps
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:43:22 +0000 (08:43 -0800)]
Merge pull request #25681 from joscollin/wip-37632-mimic
mimic: mds: remove duplicated l_mdc_num_strays perfcounter set
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:41:52 +0000 (08:41 -0800)]
Merge pull request #25683 from joscollin/wip-37630-mimic
mimic: client: do not move f->pos untill success write
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:41:15 +0000 (08:41 -0800)]
Merge pull request #25685 from joscollin/wip-37738-mimic
mimic: MDSMonitor: allow beacons from stopping MDS that was laggy
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:40:24 +0000 (08:40 -0800)]
Merge pull request #25803 from ashishkumsingh/wip-37757-mimic
mimic: mds: clean up log messages for standby-replay
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:39:57 +0000 (08:39 -0800)]
Merge pull request #25903 from pdvian/wip-37828-mimic
mimic: client: fix fuse client hang because its pipe to mds is not ok
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:39:32 +0000 (08:39 -0800)]
Merge pull request #25980 from pdvian/wip-37907-mimic
mimic: mds: wait shorter intervals if beacon not sent
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:39:01 +0000 (08:39 -0800)]
Merge pull request #26047 from pdvian/wip-37923-mimic
mimic: qa: test_damage performs truncate test on same object repeatedly
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:37:52 +0000 (08:37 -0800)]
Merge pull request #26051 from ukernel/mimic-37594
mimic: mds: handle state change race
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:36:51 +0000 (08:36 -0800)]
Merge pull request #26066 from pdvian/wip-37986-mimic
mimic: core: Objecter::calc_op_budget: Fix invalid access to extent union member
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:36:20 +0000 (08:36 -0800)]
Merge pull request #26069 from pdvian/wip-37988-mimic
mimic: MDSMonitor: missing osdmon writeable check
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 30 Jan 2019 16:35:52 +0000 (08:35 -0800)]
Merge pull request #26072 from smithfarm/wip-37952-mimic
mimic: qa: test_damage needs to silence MDS_READ_ONLY
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Nathan Cutler [Wed, 30 Jan 2019 13:22:39 +0000 (14:22 +0100)]
Merge pull request #26180 from pdvian/wip-37894-mimic
mimic: doc: updated Ceph documentation links
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:57:50 +0000 (08:57 -0800)]
Merge pull request #25511 from smithfarm/wip-37465-mimic
mimic: rgw: master zone deletion without a zonegroup rm would break rgw rados init
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:57:13 +0000 (08:57 -0800)]
Merge pull request #25578 from pdvian/wip-37556-mimic
mimic: multisite: es sync null versioned object failed because of olh info
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:56:40 +0000 (08:56 -0800)]
Merge pull request #25624 from pdvian/wip-37560-mimic
mimic: rgw: rgwgc: process coredump in some special case
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:56:08 +0000 (08:56 -0800)]
Merge pull request #25954 from pdvian/wip-37890-mimic
mimic: rbd: fix delay time calculation for trash move
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:55:31 +0000 (08:55 -0800)]
Merge pull request #26049 from pdvian/wip-37920-mimic
mimic: test/rbd_mirror: wait for release leader lock fully complete
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 29 Jan 2019 16:54:37 +0000 (08:54 -0800)]
Merge pull request #26137 from ashishkumsingh/wip-38032-mimic
mimic: librbd: properly filter out trashed non-user images on purge
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
James McClune [Fri, 4 Jan 2019 21:32:21 +0000 (16:32 -0500)]
doc: updated Ceph documentation links
Fixes include:
- Updating Doxygen link for reference (http://docs.ceph.com/docs/master/dev/documenting/)
- Adding :ref: label for User Management page (http://docs.ceph.com/docs/master/rados/operations/user-management/)
- Update User Management link for reference (http://docs.ceph.com/docs/master/rbd/rbd-snapshot/)
Fixes: https://tracker.ceph.com/issues/37793
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
(cherry picked from commit
7ff2f215a3d051c4ef226bfdc81184d89520e152 )
Yuri Weinstein [Fri, 25 Jan 2019 16:14:30 +0000 (08:14 -0800)]
Merge pull request #25699 from xiexingguo/wip-37744
mimic: osd/OSDMap: cancel mapping if target osd is out
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:13:30 +0000 (08:13 -0800)]
Merge pull request #25292 from smithfarm/wip-37417-mimic
mimic: mgr: various python3 fixes
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:12:47 +0000 (08:12 -0800)]
Merge pull request #25299 from smithfarm/wip-37428-mimic
mimic: msg/async: crashes when authenticator provided by verify_authorizer not implemented
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:11:54 +0000 (08:11 -0800)]
Merge pull request #25718 from ashishkumsingh/wip-37552-mimic
mimic: osdc/Objecter: update op_target_t::paused in _calc_target
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Fri, 25 Jan 2019 16:11:14 +0000 (08:11 -0800)]
Merge pull request #25759 from pdvian/wip-37599-mimic
mimic: pybind/mgr: drop unnecessary iterkeys usage to make py-3 compatible
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:10:18 +0000 (08:10 -0800)]
Merge pull request #25864 from ashishkumsingh/wip-37826-mimic
mimic: mgr: fix crash due to multiple sessions from daemons with same name
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:09:09 +0000 (08:09 -0800)]
Merge pull request #25368 from pdvian/wip-37477-mimic
mimic: mgr: race between daemon state and service map in 'service status'
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:08:34 +0000 (08:08 -0800)]
Merge pull request #25513 from smithfarm/wip-37342-mimic
mimic: osd: Prioritize user specified scrubs
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:07:54 +0000 (08:07 -0800)]
Merge pull request #25605 from smithfarm/wip-37698-mimic
mimic: osd: failed assert when osd_memory_target options mismatch
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Fri, 25 Jan 2019 16:06:41 +0000 (08:06 -0800)]
Merge pull request #25809 from pdvian/wip-37742-mimic
mimic: build/ops: rpm: require ceph-base instead of ceph-common
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:06:10 +0000 (08:06 -0800)]
Merge pull request #25844 from pdvian/wip-37810-mimic
mimic: mon/OSDMonitor: do not populate void pg_temp into nextmap
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:05:34 +0000 (08:05 -0800)]
Merge pull request #25846 from pdvian/wip-37812-mimic
mimic: mon: shutdown messenger early to avoid accessing deleted logger
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Fri, 25 Jan 2019 16:04:33 +0000 (08:04 -0800)]
Merge pull request #25850 from ashishkumsingh/wip-37814-mimic
mimic: qa/workunits/rados/test_health_warnings: prevent out osds
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:03:44 +0000 (08:03 -0800)]
Merge pull request #25854 from ashishkumsingh/wip-37824-mimic
mimic: os/bluestore: KernelDevice::read() does the EIO mapping now.
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:03:07 +0000 (08:03 -0800)]
Merge pull request #25958 from xiexingguo/wip-mimic-async-fixes
mimic: msg/async: backport recent messenger fixes
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Alfredo Deza [Fri, 25 Jan 2019 16:01:42 +0000 (11:01 -0500)]
Merge pull request #26118 from ceph/backport-mimic-26084
mimic: ceph-volume: mark a device not available if it belongs to ceph-disk
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:01:12 +0000 (08:01 -0800)]
Merge pull request #25386 from pdvian/wip-37483-mimic
mimic: rgw: Don't treat colons specially in resource part of ARN
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:00:43 +0000 (08:00 -0800)]
Merge pull request #25449 from smithfarm/wip-37518-mimic
mimic: rgw: fix max-size in radosgw-admin and REST Admin API
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 16:00:10 +0000 (08:00 -0800)]
Merge pull request #25459 from pdvian/wip-37536-mimic
mimic: librbd: reset snaps in rbd_snap_list()
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:59:34 +0000 (07:59 -0800)]
Merge pull request #25485 from pdvian/wip-37548-mimic
mimic: rgw_file: user info never synced since librgw init
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:59:04 +0000 (07:59 -0800)]
Merge pull request #25505 from smithfarm/wip-37550-mimic
mimic: rgw: multisite: sync gets stuck retrying deletes that fail with ERR_PRECONDITION_FAILED
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:58:35 +0000 (07:58 -0800)]
Merge pull request #25643 from pdvian/wip-37562-mimic
mimic: rgw: fix version bucket stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:57:49 +0000 (07:57 -0800)]
Merge pull request #25740 from pdvian/wip-37649-mimic
mimic: rgw: feature -- log successful bucket resharding events
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:56:44 +0000 (07:56 -0800)]
Merge pull request #25899 from ashishkumsingh/wip-37558-mimic
mimic: rgw: handle S3 version 2 pre-signed urls with meta-data
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Fri, 25 Jan 2019 15:56:08 +0000 (07:56 -0800)]
Merge pull request #26003 from smithfarm/wip-37948-mimic
mimic: rgw: debug logging for v4 auth does not sanitize encryption keys
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Fri, 25 Jan 2019 13:34:10 +0000 (14:34 +0100)]
Merge pull request #25607 from joscollin/wip-37684-mimic
mimic: doc/user-management: Remove obsolete reset caps command
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 25 Jan 2019 13:27:09 +0000 (14:27 +0100)]
Merge pull request #25501 from joscollin/wip-37601-mimic
mimic: doc: broken link on troubleshooting-mon page
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Neha Ojha [Wed, 23 Jan 2019 20:46:42 +0000 (12:46 -0800)]
qa/overrides/short_pg_log.yaml: reduce osd_{min,max}_pg_log_entries
Fixes: http://tracker.ceph.com/issues/38025
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
4d87071bff8b4cdc1a8d167167362e98fc7f8fcf )
Mykola Golub [Tue, 22 Jan 2019 15:54:20 +0000 (17:54 +0200)]
librbd: properly filter out trashed non-user images on purge
Fixes: https://tracker.ceph.com/issues/38006
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
3d01cc627137d7f270969653fbae4b6230361d7a )
Conflicts:
- src/librbd/api/Trash.cc
- src/tools/rbd/action/Trash.cc
In mimic, the code that needs fixing was in
'tools/rbd/action/Trash.cc'.
xie xingguo [Fri, 18 Jan 2019 10:14:52 +0000 (18:14 +0800)]
osd/OSDMap: be more aggressive when trying to balance
Previously we'd require the absolute deviation >= 1 before
an osd can fill in the overfull or underfull set, which as
a result can get some osds stuck severely underfull forever.
This patch tries to get us out of those corner cases mentioned
above and can be scrutinized from two aspects:
- a standard deviation is introduced to evaluate the efficiency
of balancing, therefore making the distribution of pgs always
converge to the perfect status (standard deviation == 0).
- populate overfull or underfull osds more aggressively by
gradually allowing the absolute deviations converging towards
to 0 instead of 1.
It turns out the balancer module works even better now after
applying this patch. E.g.:
```
OSD=5 MON=1 MGR=1 MDS=0 ../src/vstart.sh -x -l -b -n -d
bin/ceph osd set-require-min-compat-client luminous
bin/ceph balancer mode upmap
bin/ceph balancer on
bin/ceph osd pool create rbd 117
// wait until automatic balancing is done
bin/ceph osd pool create aaa 133
```
__before__:
```
ID CLASS WEIGHT REWEIGHT SIZE RAW USE DATA OMAP META AVAIL %USE VAR PGS STATUS
0 hdd 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 151 up
1 hdd 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 153 up
2 hdd 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 147 up
3 hdd 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 149 up
4 hdd 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 150 up
TOTAL 50 GiB 5.3 GiB 19 MiB 0 B 5 GiB 45 GiB 10.60
```
__after__:
```
ID CLASS WEIGHT REWEIGHT SIZE RAW USE DATA OMAP META AVAIL %USE VAR PGS STATUS
0 hdd 0.00980 1.00000 10 GiB 1.1 GiB 6.2 MiB 0 B 1 GiB 9.0 GiB 10.62 1.00 150 up
1 hdd 0.00980 1.00000 10 GiB 1.1 GiB 6.2 MiB 0 B 1 GiB 9.0 GiB 10.62 1.00 151 up
2 hdd 0.00980 1.00000 10 GiB 1.1 GiB 6.2 MiB 0 B 1 GiB 9.0 GiB 10.62 1.00 149 up
3 hdd 0.00980 1.00000 10 GiB 1.1 GiB 6.2 MiB 0 B 1 GiB 9.0 GiB 10.62 1.00 150 up
4 hdd 0.00980 1.00000 10 GiB 1.1 GiB 6.2 MiB 0 B 1 GiB 9.0 GiB 10.62 1.00 150 up
TOTAL 50 GiB 5.3 GiB 31 MiB 0 B 5 GiB 45 GiB 10.62
```
Fixes: http://tracker.ceph.com/issues/37940
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
b01095496b00f9e052bb185fbbaa6c8efeb81530 )
Conflicts:
s/ceph_assert/assert/
xie xingguo [Sat, 12 Jan 2019 07:01:54 +0000 (15:01 +0800)]
osd/OSDMap: potential access violation fix
Seems we'll continue to access the iterator after it is invalidated
by the __erase__ method.
Also this is more efficient considering there could be some extreme
ec-pool (e.g., 8 + 2) consumers..
Fixes: http://tracker.ceph.com/issues/37881
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
df2e01f496dbc2b38800b1792082c540094d7b02 )
huangjun [Fri, 24 Aug 2018 14:47:02 +0000 (22:47 +0800)]
osd/OSDMap: don't mapping all pgs each time in calc_pg_upmaps
We have a cluster pool with 32768 pgs and 400 osds, it costs 600 seconds when doing upmap
with '--upmap-max 32768 --upmap-deviation 0.01', which is pretty slow.
After adding some debug code, the time mostly spent on pg_to_up_acting_osds, the average
time for one pg_to_up_acting_osds is about 12us, so the whole pool's pg will cost 500ms each
time, we finally have 1429 pgs need to do upmap, so it cost about 600 seconds.
Withi this patch, it only spend 5 seconds to get job done.
Signed-off-by: huangjun <huangjun@xsky.com>
(cherry picked from commit
da45e4e352b30cc4f6fd52f2f030bf7569eaee57 )
Andrew Schoen [Tue, 22 Jan 2019 15:32:00 +0000 (09:32 -0600)]
ceph-volume: mark a device not available if it belongs to ceph-disk
The `ceph-volume inventory` command will now show if a device is being
used by ceph-disk and mark it not available if so.
Fixes: https://tracker.ceph.com/issues/24871
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
d14a6b284c44a3f61c0dd8c60ccc474203003653 )
Andrew Schoen [Thu, 24 Jan 2019 15:45:29 +0000 (09:45 -0600)]
Merge pull request #26113 from alfredodeza/mimic-rm37963
mimic ceph-volume fix TypeError on dmcrypt when using Python3
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Fri, 18 Jan 2019 17:51:04 +0000 (12:51 -0500)]
ceph-volume tests verify behavior of create_dmcrypt_key in python 3
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
69613cc5a8b2e111e24b75ad5b69f924c89fd75b )
Alfredo Deza [Fri, 18 Jan 2019 17:50:38 +0000 (12:50 -0500)]
ceph-volume util.encryption ensure int is used for urandom (py3 compat)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
0ab9fa62d6d46464b16f08d3a5bb3da50f5030e7 )
Venky Shankar [Thu, 8 Nov 2018 12:58:37 +0000 (18:28 +0530)]
mds: disallow dumping huge caches to formatter
Dumping huge caches (~ 1G) to formatter causes mds to
hang or get terminated. Until the underlying issues is
fixed, disallow dumping cache if cache usage exceeds this
threshold. Also, Patrick feels a similar issue might be
hiding there for cache dumps to file when cache sizes
are really huge. This case has not been been reproduced
yet, hence, the limit for cache dumps to file is currently
kept not capped.
Fixes: http://tracker.ceph.com/issues/37609
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
6be2ce98c629d2cfe9d8443659e59600148b7675 )
Conflicts:
src/common/options.cc
src/mds/MDCache.cc
Minor fix for fetching config option with g_conf.
Patrick Donnelly [Wed, 16 Jan 2019 18:52:09 +0000 (10:52 -0800)]
qa: silence read-only WRN for damage testing
Fixes: http://tracker.ceph.com/issues/37944
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ac302de7b7725c259fee1852e3f402533d69f8cf )
Patrick Donnelly [Tue, 15 Jan 2019 21:45:14 +0000 (13:45 -0800)]
MDSMonitor: add missing OSDMonitor writeable check
Fixes: http://tracker.ceph.com/issues/37929
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
8ef68663d311f71d1598297c14fad39274ada41d )
Patrick Donnelly [Tue, 15 Jan 2019 20:58:13 +0000 (12:58 -0800)]
MDSMonitor: codify constraint for writeable OSDMap
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
1a3457be4ef049b4b9d6a202455fbc21c09524b9 )
Simon Ruggier [Sat, 15 Dec 2018 04:32:22 +0000 (23:32 -0500)]
Objecter::calc_op_budget: Fix invalid access to extent union member
Previously, the function was checking the extent length for any
operation with the CEPH_OSD_OP_MODE_RD and CEPH_OSD_OP_TYPE_DATA bits
set, but some operation types that have these bits set use a different
interpretation of the ceph_osd_op union.
This leads to a type safety problem where another field, such as the
object version, is interpreted as an extent length and added to the
budget. In addition to producing an incorrectly high budget for the
operation, this also triggers an assertion failure if the value is large
enough to overflow a signed 32-bit integer, as described in bug #9592
and bug #37932.
This change uses the ceph_osd_op_uses_extent function to prevent invalid
access to the union, instead of ceph_osd_op_type_data.
Fixes: http://tracker.ceph.com/issues/37932
Signed-off-by: Simon Ruggier <simon@platform.sh>
(cherry picked from commit
1cb91c2cdfa7556b23b9800c8d10033d0c815b4e )
Noah Watkins [Mon, 21 Jan 2019 21:32:39 +0000 (13:32 -0800)]
Merge pull request #26035 from noahdesu/mimic-pr26015
mimic: cli: dump osd-fsid as part of osd find <id>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Andrew Schoen [Mon, 21 Jan 2019 21:28:57 +0000 (15:28 -0600)]
Merge pull request #26029 from alfredodeza/mimic-fix_raw_input
mimic ceph-volume: Adapt code to support Python3
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 21 Jan 2019 19:40:53 +0000 (13:40 -0600)]
Merge pull request #26013 from alfredodeza/mimic-bz1644847
mimic ceph-volume zap devices associated with an OSD ID and/or OSD FSID
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Yan, Zheng [Mon, 29 Oct 2018 03:03:00 +0000 (11:03 +0800)]
mds: handle state change race
In multi-mds cluster, recovering mds may receive mdsmap that changes
its state after other mds. Furthermore, the recovering mds may receive
messages tiggered by its state change from other mds before it receive
corresponding mdsmap.
Fixes: http://tracker.ceph.com/issues/37594
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
d3a444473abc98e5ce8121af24538a141a292777 )
Conflicts:
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/MDSRank.h
Mykola Golub [Sat, 12 Jan 2019 15:55:25 +0000 (15:55 +0000)]
test/rbd_mirror: wait for release leader lock fully complete
Previously the wait context was completed at post_release_lock
stage, which still was not the end of the lock releasing process.
Fixes: https://tracker.ceph.com/issues/37883
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
f1b2c6a841ff90e48e8b602a9f0454a14b8f32f8 )
Patrick Donnelly [Wed, 9 Jan 2019 00:26:14 +0000 (16:26 -0800)]
qa: fix damage expectation setting
The purge queue expectation was being ignored.
Fixes: http://tracker.ceph.com/issues/37837
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
360550b1ab143bb59fd38c77569f7f5ef762801a )
Patrick Donnelly [Tue, 8 Jan 2019 23:51:53 +0000 (15:51 -0800)]
qa: fix loop variable reference
Otherwise the Mutation for Truncate is done on obj_id of the last iteration of the previous loop.
Fixes: http://tracker.ceph.com/issues/37836
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
909d0f1333a730c648c08cda047bb5f356a61986 )
Noah Watkins [Thu, 17 Jan 2019 19:16:44 +0000 (11:16 -0800)]
cli: dump osd-fsid as part of osd find <id>
Dumps the osd-fsid uuid as part of the `osd find <id>` command.
Currently this uuid is only available as part of `osd dump` but
ceph-ansible has a use case to interrogate a single osd without needing
the entire osdmap dump.
Fixes: http://tracker.ceph.com/issues/37966
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit
4d01b2c96e0ea1122225c30da21bc39c40e15c0e )
Volker Theile [Thu, 29 Nov 2018 12:48:30 +0000 (13:48 +0100)]
ceph-volume: Adapt code to support Python3
- raw_input() has been renamed to input() in Python3
- Changed signature of prompt_bool. Variables that are named like built-ins must be named like xxx_ and not _xxx
Fixes: https://tracker.ceph.com/issues/37470
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
fe25a0ea625e75c598f6d0749e7259eef167fa8e )
Alfredo Deza [Fri, 7 Dec 2018 17:29:45 +0000 (12:29 -0500)]
ceph-volume tests.functional.batch symlink test_zap to all batch scenarios
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
d3c0058911fd0b3e273a7afb1a9f4f6072942d75 )
Alfredo Deza [Fri, 7 Dec 2018 17:28:37 +0000 (12:28 -0500)]
ceph-volume tests.functional.batch add test_zap yaml to tox.ini
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
25843b762953e53c08e6475d1f9dbfd5102a283f )
Alfredo Deza [Fri, 7 Dec 2018 17:08:44 +0000 (12:08 -0500)]
ceph-volume tests.functional.batch create a separate test_zap playbook
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
6b8f0d483a6203de204fcc605ade536749a9f6c8 )
Alfredo Deza [Fri, 7 Dec 2018 12:53:43 +0000 (07:53 -0500)]
ceph-volume lvm.zap update success message for OSD IDs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
73bb17f79a5b67b28ceace9dc7dcc2dde38dad5e )