]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
5 years agomgr: update metadata if an osd just joins
Kefu Chai [Thu, 5 Mar 2020 15:42:13 +0000 (23:42 +0800)]
mgr: update metadata if an osd just joins

instead of using "front_address" for checking if we have a new OSD
reusing existing a known identify shows up in the osdmap, it'd be
simpler to compare the up_from epoch with the osdmap's epoch. as
objecter will subscribe **every** osdmap after mgr boots. so mgr
should be able to see the osdmap when the osd joins the cluster
where the up_from epoch is identical to osdmap's epoch.

this way is simpler than existing approach. but it will involve
more overhead if osd reboots frequently without changing their
metadata.

before this change, the metadata is requested/updated only if
the public (front) address is changed.

after this change, the metadata is requested/updated whenever
an osd reboots.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr: update "hostname" when we already have the daemon state from the same entity
Kefu Chai [Thu, 5 Mar 2020 15:35:46 +0000 (23:35 +0800)]
mgr: update "hostname" when we already have the daemon state from the same entity

there is chance that we reuse the identity of a daemon and deploy the
daemon on a different host. in that case, the existing daemon state
should be updated with the new hostname.

Fixes: https://tracker.ceph.com/issues/44446
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33730 into master
Sage Weil [Thu, 5 Mar 2020 01:20:27 +0000 (19:20 -0600)]
Merge PR #33730 into master

* refs/pull/33730/head:
cephadm/vstart-smoke.sh: a smoke test to run against vstart
mgr/cephadm: fix prom reconfig loop when dashboard is disabled
mgr/cephadm: clean up log messages a bit
mgr/cephadm: force remove daemons when removing service
mgr/cephadm: do not error out on service rm|action if no daemons
mgr/orchestrator: allow 'orch rm mon|mgr --force'

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #33731 from wjwithagen/wjw-fix-test-compressor-gtest
Kefu Chai [Wed, 4 Mar 2020 23:50:41 +0000 (07:50 +0800)]
Merge pull request #33731 from wjwithagen/wjw-fix-test-compressor-gtest

src/test/compressor: Add missing gtest

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33663 into master
Sage Weil [Wed, 4 Mar 2020 22:54:10 +0000 (16:54 -0600)]
Merge PR #33663 into master

* refs/pull/33663/head:
mgr/cephadm: reduce boilerplate for unittests

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agosrc/test/compressor: Add missing gtest
Willem Jan Withagen [Wed, 4 Mar 2020 21:50:44 +0000 (22:50 +0100)]
src/test/compressor: Add missing gtest

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agomgr/cephadm: reduce boilerplate for unittests
Joshua Schmid [Mon, 2 Mar 2020 14:12:38 +0000 (15:12 +0100)]
mgr/cephadm: reduce boilerplate for unittests

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agocephadm/vstart-smoke.sh: a smoke test to run against vstart
Sage Weil [Wed, 4 Mar 2020 20:24:38 +0000 (14:24 -0600)]
cephadm/vstart-smoke.sh: a smoke test to run against vstart

This provides decent coverage of cephadm in practice, and can run against
a vstart cluster without having to go build containers.

vstart-cleanup.sh will clean up an aborted test reasonably well without
requiring sudo.

Caveats:
- there is no coverage for osds at this point.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: fix prom reconfig loop when dashboard is disabled
Sage Weil [Wed, 4 Mar 2020 20:21:10 +0000 (14:21 -0600)]
mgr/cephadm: fix prom reconfig loop when dashboard is disabled

We need to consider the mgrs a dep even if the prometheus module isn't
enabled, so that we are consistent with _calc_daemon_deps() and don't
reconfig prom in a loop.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: clean up log messages a bit
Sage Weil [Wed, 4 Mar 2020 20:20:28 +0000 (14:20 -0600)]
mgr/cephadm: clean up log messages a bit

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: force remove daemons when removing service
Sage Weil [Wed, 4 Mar 2020 17:38:13 +0000 (11:38 -0600)]
mgr/cephadm: force remove daemons when removing service

The rm CLI checks for --force based on type, so it isn't passed down
through the implementations.  So, pass it through.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: do not error out on service rm|action if no daemons
Sage Weil [Wed, 4 Mar 2020 13:22:08 +0000 (07:22 -0600)]
mgr/cephadm: do not error out on service rm|action if no daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: allow 'orch rm mon|mgr --force'
Sage Weil [Tue, 3 Mar 2020 21:41:24 +0000 (15:41 -0600)]
mgr/orchestrator: allow 'orch rm mon|mgr --force'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33704 into master
Sage Weil [Wed, 4 Mar 2020 20:25:05 +0000 (14:25 -0600)]
Merge PR #33704 into master

* refs/pull/33704/head:
mgr/cephadm: avoid racing updates to spec dict
mgr/cephadm: make _do_upgrade work synchronously
mgr/cephadm/tests/test_cephadm: remove broken rgw_update_fail test
mgr/cephadm: make _apply_service move services
mgr/cephadm: log when we create, destroy daemons
mgr/cephadm: drop async_map_completion decorators from create funcs
mgr/cephadm: _create_osd -> _create_osds
mgr/cephadm: _remove_daemon -> _remove_daemons

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/cephadm: avoid racing updates to spec dict
Sage Weil [Wed, 4 Mar 2020 17:47:01 +0000 (11:47 -0600)]
mgr/cephadm: avoid racing updates to spec dict

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: make _do_upgrade work synchronously
Sage Weil [Tue, 3 Mar 2020 18:27:51 +0000 (12:27 -0600)]
mgr/cephadm: make _do_upgrade work synchronously

It mostly was, but it was futzing with completions when it didn't need to.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm/tests/test_cephadm: remove broken rgw_update_fail test
Sage Weil [Tue, 3 Mar 2020 18:20:19 +0000 (12:20 -0600)]
mgr/cephadm/tests/test_cephadm: remove broken rgw_update_fail test

This was trying to show that we won't put 2 RGWs from different zones
on the same host.  In reality, the test was only passing because it was
specifying an invalid placement spec (count=3 in a 2-host cluster).

It's true that we shouldn't do that because they won't be able to bind,
but the HostAssignment code doesn't handle this case currently.

See https://tracker.ceph.com/issues/44397

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: make _apply_service move services
Sage Weil [Tue, 3 Mar 2020 18:14:07 +0000 (12:14 -0600)]
mgr/cephadm: make _apply_service move services

This transitions us to a synchronous mode of operation.

Fixes: https://tracker.ceph.com/issues/44167
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: log when we create, destroy daemons
Sage Weil [Tue, 3 Mar 2020 18:13:36 +0000 (12:13 -0600)]
mgr/cephadm: log when we create, destroy daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: drop async_map_completion decorators from create funcs
Sage Weil [Tue, 3 Mar 2020 18:13:14 +0000 (12:13 -0600)]
mgr/cephadm: drop async_map_completion decorators from create funcs

So we can call them synchronously, if we chose.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: _create_osd -> _create_osds
Sage Weil [Tue, 3 Mar 2020 18:12:01 +0000 (12:12 -0600)]
mgr/cephadm: _create_osd -> _create_osds

So we could do a single daemon synchronously, if we chose.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: _remove_daemon -> _remove_daemons
Sage Weil [Tue, 3 Mar 2020 18:11:25 +0000 (12:11 -0600)]
mgr/cephadm: _remove_daemon -> _remove_daemons

So we can remove a single daemon synchronously, if we choose.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33565 into master
Sage Weil [Wed, 4 Mar 2020 18:40:37 +0000 (12:40 -0600)]
Merge PR #33565 into master

* refs/pull/33565/head:
os/bluestore: log allocation stats on a daily basis.

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33539 from cbodley/wip-rgw-doc-reshard
Casey Bodley [Wed, 4 Mar 2020 16:51:57 +0000 (11:51 -0500)]
Merge pull request #33539 from cbodley/wip-rgw-doc-reshard

doc/rgw: add design doc for multisite resharding

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #33698 from rhcs-dashboard/vstart-set-prometheus-port-for-each-mgr
Lenz Grimmer [Wed, 4 Mar 2020 16:21:38 +0000 (16:21 +0000)]
Merge pull request #33698 from rhcs-dashboard/vstart-set-prometheus-port-for-each-mgr

vstart.sh: set prometheus port for each mgr.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33047 into master
Sage Weil [Wed, 4 Mar 2020 15:58:45 +0000 (09:58 -0600)]
Merge PR #33047 into master

* refs/pull/33047/head:
qa/rgw: exercise DeleteRange in test_bucket_index_log_trim

Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
5 years agoMerge PR #33287 into master
Sage Weil [Wed, 4 Mar 2020 15:57:36 +0000 (09:57 -0600)]
Merge PR #33287 into master

* refs/pull/33287/head:
rgw: move frontends initial init to after global_init()
rgw: ssl: don't try to init certificate if not needed
rgw: frontend: add rgw_frontend_defaults configurable
rgw: beast ssl: enable use of meta variable for cert config
rgw: beast ssl: improve output
rgw: beast frontend: handle default ssl configurables
rgw: update docs about ssl config through config-key
rgw: allow beast ssl frontend cert config via mon config-key
rgw: create config-key svc
rgw: svc/rados: new mon_command call

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33612 from votdev/issue_44322_rgw_user_max_buckets
Lenz Grimmer [Wed, 4 Mar 2020 15:38:58 +0000 (15:38 +0000)]
Merge pull request #33612 from votdev/issue_44322_rgw_user_max_buckets

mgr/dashboard: Not able to restrict bucket creation for new user

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #33721 from smithfarm/wip-nautilus_14_2_8
Abhishek L [Wed, 4 Mar 2020 15:29:54 +0000 (16:29 +0100)]
Merge pull request #33721 from smithfarm/wip-nautilus_14_2_8

doc/releases: add 14.2.8 to release timeline

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
5 years agodoc/rgw: add design doc for multisite resharding
Casey Bodley [Tue, 25 Feb 2020 19:24:01 +0000 (14:24 -0500)]
doc/rgw: add design doc for multisite resharding

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge PR #33705 into master
Sage Weil [Wed, 4 Mar 2020 14:53:24 +0000 (08:53 -0600)]
Merge PR #33705 into master

* refs/pull/33705/head:
qa/suites/upgrade/nautilus-x/parallel: restart mgr.x before mons

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #33723 from tchaikov/wip-seastar-on-demand
Kefu Chai [Wed, 4 Mar 2020 14:50:24 +0000 (22:50 +0800)]
Merge pull request #33723 from tchaikov/wip-seastar-on-demand

run-make-check.sh: WITH_SEASTAR on demand

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agorun-make-check.sh: WITH_SEASTAR on demand
Kefu Chai [Wed, 4 Mar 2020 14:09:31 +0000 (22:09 +0800)]
run-make-check.sh: WITH_SEASTAR on demand

don't compile WITH_SEASTAR=ON unless required

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/releases: add 14.2.8 to release timeline
Nathan Cutler [Wed, 4 Mar 2020 13:29:12 +0000 (14:29 +0100)]
doc/releases: add 14.2.8 to release timeline

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #33670 from theanalyst/doc/releases/v14.2.8
Abhishek L [Wed, 4 Mar 2020 13:21:22 +0000 (14:21 +0100)]
Merge pull request #33670 from theanalyst/doc/releases/v14.2.8

doc: releases: v14.2.8 release notes

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Neha Ojha <nojha@redhat.com>
Reviewed-By: Patrick Donelly <pdonell@redhat.com>
5 years agoMerge pull request #33709 from tchaikov/wip-ceph-py-py3-rados
Kefu Chai [Wed, 4 Mar 2020 13:16:21 +0000 (21:16 +0800)]
Merge pull request #33709 from tchaikov/wip-ceph-py-py3-rados

qa/tasks: py3 compat (tasks exercised by rados suites)

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agovstart.sh: set prometheus port for each mgr.
Alfonso Martínez [Tue, 3 Mar 2020 15:32:28 +0000 (16:32 +0100)]
vstart.sh: set prometheus port for each mgr.

Fixes: https://tracker.ceph.com/issues/44417
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
5 years agoMerge pull request #33690 from rhcs-dashboard/44237-remove-config-opt-read-from-syste...
Kefu Chai [Wed, 4 Mar 2020 12:54:42 +0000 (20:54 +0800)]
Merge pull request #33690 from rhcs-dashboard/44237-remove-config-opt-read-from-system-roles

mgr/dashboard: remove 'config-opt: read' perm. from system roles.

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #33699 from liewegas/fix-44078
Kefu Chai [Wed, 4 Mar 2020 12:52:06 +0000 (20:52 +0800)]
Merge pull request #33699 from liewegas/fix-44078

common/ceph_time: tolerate mono time going backwards

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #33701 from tchaikov/wip-mgr-orch-exception
Kefu Chai [Wed, 4 Mar 2020 12:47:44 +0000 (20:47 +0800)]
Merge pull request #33701 from tchaikov/wip-mgr-orch-exception

mgr/orch: try harder when pickle fails to marshal an exception

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #33682 from thinkercui/bugfix_monsession_map_lock
Kefu Chai [Wed, 4 Mar 2020 12:40:34 +0000 (20:40 +0800)]
Merge pull request #33682 from thinkercui/bugfix_monsession_map_lock

mon: Get session_map_lock before remove_session

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33703 from smithfarm/wip-doc-mon_status
Nathan Cutler [Wed, 4 Mar 2020 10:26:51 +0000 (11:26 +0100)]
Merge pull request #33703 from smithfarm/wip-doc-mon_status

doc: adjust for mon_status changes in octopus

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc: releases: v14.2.8 release notes
Abhishek Lekshmanan [Mon, 2 Mar 2020 17:11:40 +0000 (18:11 +0100)]
doc: releases: v14.2.8 release notes

Co-Authored-By: Neha Ojha <nojha@redhat.com>
Co-Authored-By: Patrick Donelly <pdonell@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agomon: Get session_map_lock before remove_session
Xiaofei Cui [Tue, 3 Mar 2020 07:58:02 +0000 (15:58 +0800)]
mon: Get session_map_lock before remove_session

Get session_map_lock to prevent race.

Fixes: https://tracker.ceph.com/issues/44407
Signed-off-by: Xiaofei Cui <cuixiaofei@sangfor.com.cn>
5 years agoMerge pull request #33482 from rosinL/wip-fix-unitest-seastar-socket
Kefu Chai [Wed, 4 Mar 2020 05:35:23 +0000 (13:35 +0800)]
Merge pull request #33482 from rosinL/wip-fix-unitest-seastar-socket

test/test_socket: fix dispatch_sockets() unexpected exception

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agoqa/tasks/ceph_deploy: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 18:18:43 +0000 (19:18 +0100)]
qa/tasks/ceph_deploy: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/manypools: get rid of itervalues for py3 compat
Kyr Shatskyy [Sat, 15 Feb 2020 10:07:22 +0000 (11:07 +0100)]
qa/tasks/manypools: get rid of itervalues for py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/vstart_runner: use io.BytesIO for py3 compat
Kyr Shatskyy [Mon, 2 Mar 2020 14:43:41 +0000 (15:43 +0100)]
qa/tasks/vstart_runner: use io.BytesIO for py3 compat

Use io.BytesIO instead of StringIO for py3 compatibility.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/ceph_manager: ensure str for py3 compat
Kyr Shatskyy [Tue, 25 Feb 2020 15:45:00 +0000 (16:45 +0100)]
qa/tasks/ceph_manager: ensure str for py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/ceph_objectstore_tool: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 21:46:31 +0000 (22:46 +0100)]
qa/tasks/ceph_objectstore_tool: get rid of cStringIO for py3

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/divergent_priors2: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 21:28:56 +0000 (22:28 +0100)]
qa/tasks/divergent_priors2: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/radosbenchsweep: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 21:23:11 +0000 (22:23 +0100)]
qa/tasks/radosbenchsweep: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/reg11184: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 21:17:09 +0000 (22:17 +0100)]
qa/tasks/reg11184: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 20:36:48 +0000 (21:36 +0100)]
qa/tasks: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 20:29:30 +0000 (21:29 +0100)]
qa/tasks: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/netem: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 20:19:08 +0000 (21:19 +0100)]
qa/tasks/netem: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/scrub_test: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 20:10:59 +0000 (21:10 +0100)]
qa/tasks/scrub_test: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/systemd: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 19:59:47 +0000 (20:59 +0100)]
qa/tasks/systemd: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/admin_socket: get rid of cStringIO for py3
Kyr Shatskyy [Fri, 21 Feb 2020 18:35:15 +0000 (19:35 +0100)]
qa/tasks/admin_socket: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/cephadm: get rid of cStringIO for py3
Kyr Shatskyy [Sat, 15 Feb 2020 11:12:27 +0000 (12:12 +0100)]
qa/tasks/cephadm: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/omapbench: get rid of itervalues for py3
Kyr Shatskyy [Sat, 15 Feb 2020 10:21:15 +0000 (11:21 +0100)]
qa/tasks/omapbench: get rid of itervalues for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/mgr: get rid of itervalues for py3
Kyr Shatskyy [Sat, 15 Feb 2020 10:16:26 +0000 (11:16 +0100)]
qa/tasks/mgr: get rid of itervalues for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/watch_notify_stress: get rid of itervalues for py3
Kyr Shatskyy [Sat, 15 Feb 2020 10:14:31 +0000 (11:14 +0100)]
qa/tasks/watch_notify_stress: get rid of itervalues for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/osd_max_pg_per_osd: get rid of itervalues for py3
Kyr Shatskyy [Sat, 15 Feb 2020 10:13:22 +0000 (11:13 +0100)]
qa/tasks/osd_max_pg_per_osd: get rid of itervalues for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/radosbench.py: get rid of itervalues for py3 compat
Kyr Shatskyy [Sat, 15 Feb 2020 10:07:50 +0000 (11:07 +0100)]
qa/tasks/radosbench.py: get rid of itervalues for py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/rados: get rid of itervalues for py3
Kyr Shatskyy [Sat, 15 Feb 2020 02:36:08 +0000 (03:36 +0100)]
qa/tasks/rados: get rid of itervalues for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/daemonwatchdog: py3 compat
Kyr Shatskyy [Tue, 17 Dec 2019 01:26:12 +0000 (02:26 +0100)]
qa/tasks/daemonwatchdog: py3 compat

Address error:
        RuntimeError: dictionary changed size during iteration

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/workunit: py3 compat
Kyr Shatskyy [Tue, 17 Dec 2019 00:46:26 +0000 (01:46 +0100)]
qa/tasks/workunit: py3 compat

Use six.ensure_str for `get_file()` output in order to
make code py3 compatible

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks: fix import module path for py3 compat
Kyr Shatskyy [Mon, 16 Dec 2019 10:35:08 +0000 (11:35 +0100)]
qa/tasks: fix import module path for py3 compat

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/thrashosds: fix imports for py3
Kyr Shatskyy [Mon, 16 Dec 2019 00:47:28 +0000 (01:47 +0100)]
qa/tasks/thrashosds: fix imports for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/ceph: py3 compatibility
Kyr Shatskyy [Sat, 14 Dec 2019 00:54:14 +0000 (01:54 +0100)]
qa/tasks/ceph: py3 compatibility

Addresses:
  TypeError: 'dict_values' object is not subscriptable

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks: fix imports for py3 compatibility
Kyr Shatskyy [Sat, 14 Dec 2019 00:16:34 +0000 (01:16 +0100)]
qa/tasks: fix imports for py3 compatibility

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/ceph_manager: get rid of CStringIO for py3
Kyr Shatskyy [Fri, 13 Dec 2019 23:32:07 +0000 (00:32 +0100)]
qa/tasks/ceph_manager: get rid of CStringIO for py3

Use io.BytesIO instead cStringIO.StringIO for py3 compatibility

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoqa/tasks/ceph: get rid of cStringIO for py3 compat
Kyr Shatskyy [Tue, 26 Nov 2019 12:21:15 +0000 (13:21 +0100)]
qa/tasks/ceph: get rid of cStringIO for py3 compat

Use io.BytesIO instead of cStringIO.StringIO
Use six.ensure_str whenever it needs to convert binary to str.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoMerge pull request #33584 from liewegas/fix-39525
Kefu Chai [Wed, 4 Mar 2020 04:44:38 +0000 (12:44 +0800)]
Merge pull request #33584 from liewegas/fix-39525

compressor/lz4: work around bug in liblz4 versions <1.8.2

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32444 from majianpeng/simple-debug-message
Kefu Chai [Wed, 4 Mar 2020 04:42:23 +0000 (12:42 +0800)]
Merge pull request #32444 from majianpeng/simple-debug-message

osd/PrimaryLogPG: simple debug message.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33659 from rzarzynski/wip-osd-ps-plco-via-setter
Kefu Chai [Wed, 4 Mar 2020 04:41:41 +0000 (12:41 +0800)]
Merge pull request #33659 from rzarzynski/wip-osd-ps-plco-via-setter

osd: peering updates peer_last_complete_ondisk via setter.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33660 from rzarzynski/wip-osd-clean-pgtrim-includes
Kefu Chai [Wed, 4 Mar 2020 04:41:20 +0000 (12:41 +0800)]
Merge pull request #33660 from rzarzynski/wip-osd-clean-pgtrim-includes

osd: drop unnecessary includes of messages/MOSDPGTrim.h.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33673 from cbodley/wip-denc-enum
Kefu Chai [Wed, 4 Mar 2020 04:40:48 +0000 (12:40 +0800)]
Merge pull request #33673 from cbodley/wip-denc-enum

denc: support enums wider than 8 bits

Reviewed-By: Adam Emersen <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33689 from Songweibin/wip-fix-typos
Xie Xingguo [Wed, 4 Mar 2020 00:04:27 +0000 (08:04 +0800)]
Merge pull request #33689 from Songweibin/wip-fix-typos

doc/rbd: fix small typos

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge PR #33667 into master
Sage Weil [Tue, 3 Mar 2020 21:59:33 +0000 (15:59 -0600)]
Merge PR #33667 into master

* refs/pull/33667/head:
mgr/orch: show placement in 'orch ls'
mgr/orch: fix SPEC alignment in 'orch ls'
mgr/orch: include spec ref in ServiceDescription

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33669 into master
Sage Weil [Tue, 3 Mar 2020 21:59:22 +0000 (15:59 -0600)]
Merge PR #33669 into master

* refs/pull/33669/head:
mgr/cephadm: reduce log level for NodeAssignment
mgr/cephadm: make NodeAssignment return a simple host list

Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agodoc: adjust for mon_status changes in octopus
Nathan Cutler [Tue, 3 Mar 2020 17:28:19 +0000 (18:28 +0100)]
doc: adjust for mon_status changes in octopus

In octopus, we no longer have "ceph mon_status", but we do have
"ceph tell mon.<id> mon_status", so reflect this in the docs.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge PR #33678 into master
Sage Weil [Tue, 3 Mar 2020 21:43:33 +0000 (15:43 -0600)]
Merge PR #33678 into master

* refs/pull/33678/head:
mgr/cephadm: fix upgrade when daemon is stopped

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33671 into master
Sage Weil [Tue, 3 Mar 2020 21:31:43 +0000 (15:31 -0600)]
Merge PR #33671 into master

* refs/pull/33671/head:
mgr/cephadm: refresh configs when dependencies change
mgr/cephadm: track last config time and dependencies

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33695 into master
Sage Weil [Tue, 3 Mar 2020 20:58:49 +0000 (14:58 -0600)]
Merge PR #33695 into master

* refs/pull/33695/head:
mgr/orch: add apply alertmanager to CLI
mgr/orch: add apply grafana to CLI

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #33672 into master
Sage Weil [Tue, 3 Mar 2020 20:58:20 +0000 (14:58 -0600)]
Merge PR #33672 into master

* refs/pull/33672/head:
Refactor, prepare for other adoptions

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/upgrade/nautilus-x/parallel: restart mgr.x before mons
Neha [Mon, 2 Mar 2020 22:01:54 +0000 (22:01 +0000)]
qa/suites/upgrade/nautilus-x/parallel: restart mgr.x before mons

Fixes: https://tracker.ceph.com/issues/44387
Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agoqa/tasks/test_orchestrator_cli: enable test_osd_create exception check
Kefu Chai [Tue, 3 Mar 2020 16:24:08 +0000 (00:24 +0800)]
qa/tasks/test_orchestrator_cli: enable test_osd_create exception check

this reverts 9639acfefe09c87adc821bb5c5cc41974685331d, as the test does
make sense. what fails this test is the machinary to marshal/unmarshal
exception fails to handle un-picklable exceptions. the previous commit
is supposed to use a fallback to handle them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orch: try harder when pickle fails to marshal an exception
Kefu Chai [Tue, 3 Mar 2020 16:18:35 +0000 (00:18 +0800)]
mgr/orch: try harder when pickle fails to marshal an exception

pickle cannot marshal instances of class not defined in the top level of
a module. for instance, `DriveGroupValidationError` is defined in a
submodule of `ceph` python module, that's why we cannot capture it.

this prevent the `ceph` command line from getting a proper error when
the command fails if the command is implemented using cross python
module call(s).

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #33664 into master
Patrick Donnelly [Tue, 3 Mar 2020 17:44:22 +0000 (09:44 -0800)]
Merge PR #33664 into master

* refs/pull/33664/head:
doc: change case from `apis` to `APIs`

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #33655 from p-se/pse-fix-prom-alert-pool-full
Lenz Grimmer [Tue, 3 Mar 2020 16:23:31 +0000 (16:23 +0000)]
Merge pull request #33655 from p-se/pse-fix-prom-alert-pool-full

monitoring: restore lost fix for `pool full` alert

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge PR #33636 into master
Patrick Donnelly [Tue, 3 Mar 2020 16:17:43 +0000 (08:17 -0800)]
Merge PR #33636 into master

* refs/pull/33636/head:
qa: add upgrade test for volume upgrade from legacy

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agocommon/ceph_time: tolerate mono time going backwards
Sage Weil [Tue, 3 Mar 2020 16:09:06 +0000 (10:09 -0600)]
common/ceph_time: tolerate mono time going backwards

Some kernels (and possibly some hardware?) can trigger a monotonic clock
that goes back in time.  That, in turn, can lead to a negative monotonic
time span.  This would trigger an assert.

This this problem seems to be widespread, tolerate the case and interpret
it as a 0-length interval (vs something negative).

Fixes: https://tracker.ceph.com/issues/44078
Fixes: https://tracker.ceph.com/issues/43365
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33694 into master
Sage Weil [Tue, 3 Mar 2020 15:07:19 +0000 (09:07 -0600)]
Merge PR #33694 into master

* refs/pull/33694/head:
cephadm: fix `alertmanager not implemented yet`

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #33679 into master
Sage Weil [Tue, 3 Mar 2020 15:05:12 +0000 (09:05 -0600)]
Merge PR #33679 into master

* refs/pull/33679/head:
cephadm: fix failure when getting keyring for deploying daemons

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: add apply alertmanager to CLI
Sage Weil [Tue, 3 Mar 2020 13:34:14 +0000 (07:34 -0600)]
mgr/orch: add apply alertmanager to CLI

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orch: add apply grafana to CLI
Sage Weil [Tue, 3 Mar 2020 13:26:02 +0000 (07:26 -0600)]
mgr/orch: add apply grafana to CLI

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/cephadm: refresh configs when dependencies change
Sage Weil [Mon, 2 Mar 2020 20:21:20 +0000 (14:21 -0600)]
mgr/cephadm: refresh configs when dependencies change

If a daemon config (e.g., prometheus) depends on other daemons'
existence, refresh the config if that list changes (e.g., new
node-exporter, mgr removed, etc.).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33588 from dillaman/wip-rbd-snapshot-mirror
Mykola Golub [Tue, 3 Mar 2020 13:19:55 +0000 (15:19 +0200)]
Merge pull request #33588 from dillaman/wip-rbd-snapshot-mirror

rbd-mirror: initial end-to-end test and associated bug fixes

Reviewed-by: Mykola Golub <mgolub@suse.com>