Kyr Shatskyy
a28d347305
qa/tasks/systemd: get rid of cStringIO for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:17 +08:00
Kyr Shatskyy
3eb341db27
qa/tasks/admin_socket: get rid of cStringIO for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:17 +08:00
Kyr Shatskyy
145ba3e100
qa/tasks/cephadm: get rid of cStringIO for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:17 +08:00
Kyr Shatskyy
1140b5f027
qa/tasks/omapbench: get rid of itervalues for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
eb10276c1c
qa/tasks/mgr: get rid of itervalues for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
6e328edcbc
qa/tasks/watch_notify_stress: get rid of itervalues for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
b2d52220e3
qa/tasks/osd_max_pg_per_osd: get rid of itervalues for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
3b21067bbb
qa/tasks/radosbench.py: get rid of itervalues for py3 compat
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
dd8bacdb13
qa/tasks/rados: get rid of itervalues for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
8e1526d1d6
qa/tasks/daemonwatchdog: py3 compat
...
Address error:
RuntimeError: dictionary changed size during iteration
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
ae6befb3be
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>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
1c81d3873d
qa/tasks: fix import module path for py3 compat
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
c26ea687d4
qa/tasks/thrashosds: fix imports for py3
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
fc5662957b
qa/tasks/ceph: py3 compatibility
...
Addresses:
TypeError: 'dict_values' object is not subscriptable
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
e46eb8348e
qa/tasks: fix imports for py3 compatibility
...
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
204ceee156
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>
2020-03-04 13:09:16 +08:00
Kyr Shatskyy
35cf5131e7
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>
2020-03-04 13:09:16 +08:00
Kefu Chai
63f5528930
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>
2020-03-04 12:44:38 +08:00
Kefu Chai
e2e2763750
Merge pull request #32444 from majianpeng/simple-debug-message
...
osd/PrimaryLogPG: simple debug message.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-04 12:42:23 +08:00
Kefu Chai
26b648689f
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>
2020-03-04 12:41:41 +08:00
Kefu Chai
646da4f518
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>
2020-03-04 12:41:20 +08:00
Kefu Chai
1041092696
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>
2020-03-04 12:40:48 +08:00
Xie Xingguo
c2f584f32a
Merge pull request #33689 from Songweibin/wip-fix-typos
...
doc/rbd: fix small typos
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2020-03-04 08:04:27 +08:00
Sage Weil
f8bd9a7ddd
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>
2020-03-03 15:59:33 -06:00
Sage Weil
6558f42110
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>
2020-03-03 15:59:22 -06:00
Sage Weil
023497df6d
Merge PR #33678 into master
...
* refs/pull/33678/head:
mgr/cephadm: fix upgrade when daemon is stopped
Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-03 15:43:33 -06:00
Sage Weil
dbdc551b9a
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>
2020-03-03 15:31:43 -06:00
Sage Weil
cbbc3bc73c
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>
2020-03-03 14:58:49 -06:00
Sage Weil
e2202f5417
Merge PR #33672 into master
...
* refs/pull/33672/head:
Refactor, prepare for other adoptions
Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-03 14:58:20 -06:00
Patrick Donnelly
9c82857af5
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>
2020-03-03 09:44:22 -08:00
Lenz Grimmer
e0ebed7bdc
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>
2020-03-03 16:23:31 +00:00
Patrick Donnelly
416a26e733
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>
2020-03-03 08:17:43 -08:00
Sage Weil
453d611eb3
Merge PR #33694 into master
...
* refs/pull/33694/head:
cephadm: fix `alertmanager not implemented yet`
Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-03 09:07:19 -06:00
Sage Weil
e7a4c8f1a5
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>
2020-03-03 09:05:12 -06:00
Sage Weil
da506ac59a
mgr/orch: add apply alertmanager to CLI
...
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-03 08:24:52 -06:00
Sage Weil
86a35fba17
mgr/orch: add apply grafana to CLI
...
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-03 08:24:46 -06:00
Sage Weil
5c1df2ab87
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>
2020-03-03 07:43:15 -06:00
Mykola Golub
5e15e111d3
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>
2020-03-03 15:19:55 +02:00
Sage Weil
6421f6a5a2
mgr/orch: show placement in 'orch ls'
...
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-03 07:01:07 -06:00
Sage Weil
ac73ccc0b1
mgr/cephadm: fix upgrade when daemon is stopped
...
Tried to fix this in 5649d5571c
but didn't remove the early image_id
check.
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-03 06:37:33 -06:00
Patrick Seidensal
41fd2f5ec3
cephadm: fix alertmanager not implemented yet
...
```
Traceback (most recent call last):
File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 391, in do_work
res = self._on_complete_(*args, **kwargs)
File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 455, in call_self
return f(self, *inner_args)
File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 2576, in _create_alertmanager
custom_config=self._generate_alertmanager_config)
File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 2051, in _create_daemon
stdin=json.dumps(cephadm_config))
File "/home/user/src/ceph/src/pybind/mgr/cephadm/module.py", line 1459, in _run_cephadm
code, '\n'.join(err)))
RuntimeError: cephadm exited with an error code: 1, stderr:ERROR: alertmanager not implemented yet
```
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-03-03 12:53:43 +01:00
songweibin
ffdc13e406
doc/rbd: fix small typos
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2020-03-03 19:30:27 +08:00
Ramana Raja
8034044f94
Merge pull request #33120 from vshankar/wip-mgr-volumes-clone-sync-attrs
...
mgr/volumes: sync inode attributes for cloned subvolumes
Reviewed-by: Ramana Raja <rraja@redhat.com>
2020-03-03 16:13:34 +05:30
Lenz Grimmer
8d728e04c4
Merge pull request #32423 from bk201/wip-43420
...
mgr/dashboard: allow refreshing inventory page
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-03-03 09:30:16 +00:00
Deepika Upadhyay
677b50ec74
doc: change case from apis
to APIs
...
use APIs instead of apis to be consistent throughout.
fixes: https://tracker.ceph.com/issues/44374
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-03-03 14:52:45 +05:30
Kefu Chai
0c782a86f9
Merge pull request #33680 from tchaikov/wip-crimson-cleanups
...
crimson: clang related cleanups
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
2020-03-03 16:23:23 +08:00
Kefu Chai
3f8973f105
Merge pull request #31910 from rosinL/wip-fix-dpdk-test
...
test/msgr: fix ComplexTest fail when using DPDK protocal stack
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-03 14:34:22 +08:00
Kefu Chai
2667aa441b
Merge pull request #33661 from bk203/patch-1
...
doc: update Zabbix template reference
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-03 13:52:41 +08:00
Patrick Donnelly
0c8899c985
qa: add upgrade test for volume upgrade from legacy
...
This tests that volumes created using the ceph_volume_client.py library
continue to be accessible/function via the Nautilus/Octopus ceph-mgr
volumes plugin.
Fixes: https://tracker.ceph.com/issues/42723
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2020-03-02 20:27:15 -08:00
Kefu Chai
3ed5f0aea4
cmake: build used source
...
to address the link failures when compiling using clang
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-03 11:47:11 +08:00