Commit Graph

110286 Commits

Author SHA1 Message Date
Kefu Chai
0930652318 pybind/mgr/dashboard/.pylintrc: drop xrange from the whitelist
since dashboard is now xrange-free, there is no need to have
xrange-builtin in whitelist, moreover, in python3 the error message
cannot be emitted at seeing xrange.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-07 20:33:47 +08:00
Kefu Chai
ad2bbbc1ed pybind: s/xrange/range/
fortunately, cython does not complain at seeing xrange, but let's drop
the last bit of python2.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-07 20:33:47 +08:00
Kefu Chai
dd8d929c9c qa,tes: s/xrange/range/
use six.moves.range for python3 copatibility, we can drop six after
migrating to python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-07 20:33:47 +08:00
Kefu Chai
f10f865796 qa/tasks/cephfs: use StringIO for capturing str
if we don't expect non-utf8 in stdout, use StringIO instead of BytesIO.

see also d8d44ed156

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-07 20:33:47 +08:00
Kefu Chai
d7258ea7fd qa/tasks: use next(iter(..)) for accessing first element in a view
in python2, dict.values() and dict.keys() return lists. but in python3,
they return views, which cannot be indexed directly using an integer index.

there are three use cases when we access these views in python3:

1. get the first element
2. get all the elements and then *might* want to access them by index
3. get the first element assuming there is only a single element in
   the view
4. iterate thru the view

in the 1st case, we cannot assume the number of elements, so to be
python3 compatible, we should use `next(iter(a_dict))` instead.

in the 2nd case, in this change, the view is materialized using
`list(a_dict)`.

in the 3rd case, we can just continue using the short hand of
```py
(first_element,) = a_dict.keys()
```
to unpack the view. this works in both python2 and python3.

in the 4th case, the existing code works in both python2 and python3, as
both list and view can be iterated using `iter`, and `len` works as
well.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-07 20:33:47 +08:00
Jason Dillaman
366ecdb26d rbd: ignore tx-only mirror peers when adding new peers
There is a restriction for supporting only a single RX peer but
we should support multiple TX-only peers.

Fixes: https://tracker.ceph.com/issues/44938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-07 07:54:53 -04:00
Joshua Schmid
d524ad7230 doc/cephadm: <encrypted> is a global flag
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-04-07 13:40:21 +02:00
Sebastian Wagner
58cc88dd14
Merge pull request #34406 from liewegas/fix-cephadm-upgrade-start
qa/suites/rados/cephadm/upgrade: start from v15.2.0

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-07 11:59:00 +02:00
Yuval Lifshitz
dd49cc8307 rgw/http: add timeout to http client
also, prevent "Expect: 100-continue" from being sent
when not needed

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
2020-04-07 12:22:49 +03:00
Brad Hubbard
9c9be1b695
Merge pull request #34310 from badone/wip-restful-api-dont-pass-empty-dict-to-get
qa/suites/rados/rest: don't pass empty dict as data arg

Reviewed-by: Sage Weil <sage@redhat.com>
2020-04-07 08:14:03 +10:00
Brad Hubbard
ab569c3818
Merge pull request #34302 from badone/wip-specify-rule-for-pool-creation
Wip specify rule for pool creation

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2020-04-07 07:44:30 +10:00
Nathan Cutler
853ff61805 ceph.spec.in: remove extra tokens at end of %endif directive
RPM 4.15.1 warns: extra tokens at the end of %endif directive

Heed the warning.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-04-06 23:00:43 +02:00
Nathan Cutler
48c79c1102 ceph.spec.in: version an Obsoletes
RPM 4.15.1 warns: It's not recommended to have unversioned Obsoletes.

Heed the warning.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-04-06 23:00:23 +02:00
Adam C. Emerson
8777980283 osd: Build ceph-osd without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 11:15:06 -04:00
Adam C. Emerson
dc6528b3c2 {common, rgw}: Build ceph-osd without namespace pollution in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 11:15:06 -04:00
Adam C. Emerson
83ee7598c6 include/ceph_assert: qualify __assert_warn call in assert_warn macro
A macro never knows where it will be expanded.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 11:15:06 -04:00
Adam C. Emerson
297223e22f perfglue: Build ceph-osd without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 11:15:06 -04:00
Adam C. Emerson
06a6bc8e57 cls: Build ceph-osd without using namespace declarations in headers
This is part of a series of commits to clean up using namespace at top
level in headers.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 11:15:04 -04:00
Igor Fedotov
645b923722 os/bluestore: kill buf param in BlueFS::read
This param is redundant as it's accessible via FileReader instance.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
2020-04-06 16:43:06 +03:00
Volker Theile
a5ade11a31
Merge pull request #34239 from p-se/wip-pse-fix-false-root-vol-full-alert
monitoring: root volume full alert fires false positives

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-04-06 14:17:17 +02:00
Lenz Grimmer
b6ad9a804b
Merge pull request #34240 from krig/grafana-dashboards-fixes
mgr/dashboard: Repair broken grafana panels

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2020-04-06 10:55:20 +02:00
Jan Fajerski
292ae0305d devices/simple/scan: Fix string in log statement
A multiline string enclosed by () gained a comma, making it into a
tuple, which has no format() method.

Fixes: https://tracker.ceph.com/issues/44949

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2020-04-06 10:51:27 +02:00
Tiago Melo
566b3fda4b mgr/dashboard: Update HACKING.rst
This will update information regarding npm.

Fixes: https://tracker.ceph.com/issues/44927

Signed-off-by: Tiago Melo <tmelo@suse.com>
2020-04-06 08:38:03 +00:00
Adam C. Emerson
632e4d839f common: move to_string and to_integer overloads into root namespace
Since that's where the type is defined, that's where overloads taking
it should be defined.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2020-04-06 04:11:12 -04:00
Kefu Chai
040cec33dd
Merge pull request #34374 from sebastian-philipp/mgr-fix-tox-cephadm
pybind/mgr: Fix `run_tox.sh mgr -- cephadm`

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-06 15:34:38 +08:00
Yuval Lifshitz
7b20846871
Merge pull request #34269 from yuvalif/fix_cls_queue_logs
cls/queue: remove error message when queue is not initialized
2020-04-05 13:50:41 +03:00
Jason Dillaman
16e2ccaf14
Merge pull request #33985 from zhengchengyao/clone_metadata
librbd: children should inherit parent's stripe

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
2020-04-04 09:46:27 -04:00
Jason Dillaman
448cd3fe9a
Merge pull request #34072 from shangdehao1/fix_nfs_bug
qa/tasks/qemu: fix nfs setup and teardown bug in qemu task

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2020-04-04 09:45:49 -04:00
Josh Durgin
7655548930
Merge pull request #34371 from smithfarm/wip-43896
doc/releases/nautilus: restart OSDs to make them bind to v2 addr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2020-04-03 14:31:22 -07:00
Gregory Farnum
40fb15563d
Merge pull request #31480 from ukernel/wip-20
client: auto reconnect after blacklisted

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2020-04-03 12:53:29 -07:00
Gregory Farnum
45288ad525
Merge pull request #33915 from lxbsz/client_assert_failedddd
Client: fix Finisher assert failure

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
2020-04-03 12:49:59 -07:00
Gregory Farnum
0e7e0d59c7
Merge pull request #34386 from gregsfortytwo/wip-33279-revert-sudo
Wip 33279 revert sudo

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2020-04-03 12:36:37 -07:00
Gregory Farnum
15b3118eda
Merge pull request #34110 from ukernel/wip-44680
mds: don't assert empty io context list when shutting down

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2020-04-03 12:33:51 -07:00
Sage Weil
004b153f13 Merge PR #34385 into master
* refs/pull/34385/head:
	doc/dev/cephadm: a few notes on developing with cephadm

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-04-03 14:29:43 -05:00
Gregory Farnum
13fc503b0f
Merge pull request #34281 from vshankar/wip-44677
mgr: force purge normal ceph entities from service map

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-03 12:29:19 -07:00
Gregory Farnum
794ce8942d
Merge pull request #34306 from ukernel/wip-44771
ceph-fuse: don't get mount options from /etc/fstab when doing remount

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2020-04-03 12:28:30 -07:00
Jason Dillaman
03aa081435 rbd-mirror: add snapshot-based replay performance metrics
The mirror image status for replaying snapshot-based images now includes
bytes per second and per snapshot, in addition to an estimated number of
seconds until the image is fully synced.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:25:13 -04:00
Jason Dillaman
de445810e9 rbd-mirror: switch to json_spirit formatter for snapshot image status
This will make it cleaner and easier to add additional data fields
to the existing JSON replaying status.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:24:53 -04:00
Jason Dillaman
c0dc96bf13 rbd-mirror: add journal-based replay performance metrics
The mirror image status for replaying journal-based images now includes
bytes and entries per second in addition to an estimated number of seconds
until the image is fully synced.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:24:53 -04:00
Jason Dillaman
e04422f2c6 rbd-mirror: switch to json_spirit formatter for journal image status
The free-form journal replay status description is now JSON-encoded. The
"master"/"mirror" designators have been changed to "primary"/"non_primary"
to better align with RBD terminology.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:24:53 -04:00
Jason Dillaman
133cce8af5 rbd-mirror: periodically poll image replayer status
When metrics are incorporated, there might not be a forced status update
if no new data is available to replicate. However, we will want the metrics
to decrease over time.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:24:53 -04:00
Jason Dillaman
0b6cbdeb9d librbd: pass bytes-read statistics from deep-copy through handler
These simple stats will be utilized by rbd-mirror to compute throughput
metrics for snapshot-based mirroring.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 15:24:14 -04:00
Sage Weil
857715f7d8 Merge PR #34296 into master
* refs/pull/34296/head:
	qa/suites/rados/cephadm/smoke-roleless: add smoke test
	qa/tasks/cephadm: add 'roleless' mode

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-04-03 14:16:21 -05:00
Sage Weil
639762ca26 Merge PR #34384 into master
* refs/pull/34384/head:
	cephadm: create /var/run/ceph dir via unit.run, not unit file

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-04-03 14:16:00 -05:00
Sage Weil
44ca20017a qa/suites/rados/cephadm/upgrade: start from v15.2.0
Signed-off-by: Sage Weil <sage@redhat.com>
2020-04-03 14:15:01 -05:00
Yuri Weinstein
d23f2b70e8
Merge pull request #34405 from ceph/wip-yuriw-cron-master2
qa/tests: fixed typo
2020-04-03 10:19:17 -07:00
Jason Dillaman
c7d6e762d1 librbd: pass specialized handler interface to deep-copy
The initial version mimics the existing ProgressContext callback
interface. Later commits will add additional deep-copy unique methods.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-03 13:14:11 -04:00
yuriw
898d9c5a60 qa/tests: fixed typo
Signed-off-by: yuriw <yuri.weinstein@gmail.com>
2020-04-03 09:28:05 -07:00
Yuri Weinstein
21e1d54e76
Merge pull request #34404 from ceph/wip-yuriw-cron-master
qa/tests: added client upgrades tests for octopus, removed mimic-x/ma…
2020-04-03 09:21:14 -07:00
yuriw
8c80a43b58 qa/tests: added client upgrades tests for octopus, removed mimic-x/masted as not needed
Signed-off-by: Yuri Weinstein <yweinstein@redhat.com>
2020-04-03 08:57:28 -07:00