]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Michael Fritch [Wed, 3 Feb 2021 14:06:06 +0000 (07:06 -0700)]
mgr/cephadm: Module imported but unused (F401)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
2e2b419dafd4738553e85a905151ba1e6ffce13d )
Michael Fritch [Tue, 2 Feb 2021 17:42:44 +0000 (10:42 -0700)]
mgr/cephadm: Local variable name is assigned to but never used (F841)
add error handling when `CompletedProcess` fails during rgw relam,
zongroup create et al.
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
6658c53d6f651373f0d9c2559b3524815604d30a )
Michael Fritch [Tue, 2 Feb 2021 17:42:36 +0000 (10:42 -0700)]
mgr/cephadm: Local variable name is assigned to but never used (F841)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
97c6a8564ecbc5f39a1907d132b6646f55588326 )
Michael Fritch [Thu, 28 Jan 2021 20:16:04 +0000 (13:16 -0700)]
mgr/cephadm: Line break occurred after a binary operator (W504)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
4e4d4c5e4b6118c1629083b0bfca0fb00b500271 )
Michael Fritch [Thu, 28 Jan 2021 02:42:33 +0000 (19:42 -0700)]
mgr/cephadm: Trailing whitespace (W291)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
8e093a5993dac6ce77efb7fd9ada1671e249b475 )
Michael Fritch [Thu, 28 Jan 2021 19:50:42 +0000 (12:50 -0700)]
mgr/cephadm: undefined name 'channel' (F821)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
867c7423e505e3ce06bbac3a18e64fa2b4db3f14 )
Michael Fritch [Thu, 28 Jan 2021 18:24:57 +0000 (11:24 -0700)]
mgr/cephadm: use ==/!= to compare constant literals (F632)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
b40d28ce900fc4eb88be2480ae584c095120a51a )
Michael Fritch [Thu, 28 Jan 2021 19:43:10 +0000 (12:43 -0700)]
mgr/cephadm: f-string is missing placeholders (F541)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
22d6a1b7d8ce5530ef67f2ea8b1a9f9681dedf3a )
Michael Fritch [Thu, 28 Jan 2021 20:05:56 +0000 (13:05 -0700)]
mgr/cephadm: Do not use variables named 'I', 'O', or 'l' (E741)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
fb73d8e5c21c6ff448d1cc28b7c4900456022b82 )
Michael Fritch [Thu, 28 Jan 2021 19:17:22 +0000 (12:17 -0700)]
mgr/cephadm: Do not assign a lambda expression, use a def (E731)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
e26db8c21063f53d2fe471d39e6cf4037e3ead15 )
Michael Fritch [Thu, 28 Jan 2021 19:13:39 +0000 (12:13 -0700)]
mgr/cephadm: Do not use bare except, specify exception instead (E722)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
9b0a3e623984605bbcbcd82d38a7ccb6106b1d2b )
Michael Fritch [Thu, 28 Jan 2021 18:57:16 +0000 (11:57 -0700)]
mgr/cephadm: Comparison to true should be 'if cond is true:' or 'if cond:' (E712)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
5136f4b1d0e6426fc8d3b2b2004ba32b58f211d3 )
Michael Fritch [Thu, 28 Jan 2021 03:18:40 +0000 (20:18 -0700)]
mgr/cephadm: Multiple statements on one line (def) (E704)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
1738e22ec0b08ba225de55bf3772b6242c6cef2f )
Michael Fritch [Fri, 5 Feb 2021 18:13:40 +0000 (11:13 -0700)]
mgr/cephadm: statement ends with a semicolon (E703)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
bed9be73ee8fdbb487b18bf5fc0f149174ca0497 )
Michael Fritch [Thu, 28 Jan 2021 03:16:05 +0000 (20:16 -0700)]
mgr/cephadm: Expected 1 blank line before a nested definition (E306)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
d76324ea38cdcf9f1dac387f60bf0bec008b3ded )
Michael Fritch [Thu, 28 Jan 2021 02:52:03 +0000 (19:52 -0700)]
mgr/cephadm: Expected 2 blank lines, found 0 (E302)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
7e73af4b9880f971129b213a55d083bea2d9c342 )
Michael Fritch [Fri, 5 Feb 2021 18:13:05 +0000 (11:13 -0700)]
mgr/cephadm: at least two spaces before inline comment (E261)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
46a322ba018760610706eae92e7bd28e9b325029 )
Michael Fritch [Thu, 28 Jan 2021 19:45:10 +0000 (12:45 -0700)]
mgr/cephadm: multiple spaces after ':' (E241)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
ae76ba8a548b5543c645edc1195c45caf639eeb2 )
Michael Fritch [Thu, 28 Jan 2021 20:07:58 +0000 (13:07 -0700)]
mgr/cephadm: Missing whitespace after ',', ';', or ':' (E231)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
cf4d666573299fe3d4614ae96b0e96a8acf7bdab )
Michael Fritch [Thu, 28 Jan 2021 19:23:48 +0000 (12:23 -0700)]
mgr/cephadm: Missing whitespace around arithmetic operator (E226)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
ef45cc50b583797b13c29f656dd65f21763297b6 )
Michael Fritch [Thu, 28 Jan 2021 20:09:23 +0000 (13:09 -0700)]
mgr/cephadm: Missing whitespace around operator (E225)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
17c7c4ae7306198cc57215ec474fbaa9d425fbe1 )
Michael Fritch [Thu, 28 Jan 2021 18:55:43 +0000 (11:55 -0700)]
mgr/cephadm: Continuation line under-indented for visual indent (E128)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
918eec7d1be1eedc5305f5f9d928351fbfc19437 )
Michael Fritch [Thu, 28 Jan 2021 03:15:03 +0000 (20:15 -0700)]
mgr/cephadm: Continuation line over-indented for hanging indent (E126)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
b04fb5f2626d2621c666c7ae1bb00befa3d96dd3 )
Michael Fritch [Thu, 4 Feb 2021 19:52:31 +0000 (12:52 -0700)]
mgr/cephadm: closing bracket does not match visual indentation (E124)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
bb28ad2b5b2dd4b93eb88c21131b1aa3a9e404f1 )
Michael Fritch [Thu, 28 Jan 2021 03:08:32 +0000 (20:08 -0700)]
mgr/cephadm: Continuation line missing indentation or outdented (E122)
also resolves:
continuation line unaligned for hanging indent (E131)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
b025081f8e016414b0698e5cd79740ea5bdc13c3 )
Michael Fritch [Thu, 28 Jan 2021 03:02:27 +0000 (20:02 -0700)]
mgr/cephadm: Continuation line under-indented for hanging indent (E121)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
144ff982d263ccbf25aa12412fca6bc4382a9a3f )
Michael Fritch [Thu, 28 Jan 2021 03:00:16 +0000 (20:00 -0700)]
mgr/cephadm: Indentation is not a multiple of four (comment) (E114)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
4005d606c0bc7ea4e8f06983db8753a3bf341a32 )
Michael Fritch [Tue, 26 Jan 2021 19:02:38 +0000 (12:02 -0700)]
mgr/cephadm: introduce flake8
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
baacb36be008d61cc21bb0f94a005e2d6a510866 )
Conflicts:
src/pybind/mgr/tox.ini
Kefu Chai [Mon, 8 Feb 2021 08:27:44 +0000 (16:27 +0800)]
cephadm: do not cast subnet to unicode
this change addresses a regression introduced by
fe4f4402fbcd87667613640f2808d5d0e07e749d , which was tested before
abd9287db0e4f4f7873864119f5ce62519af1d48 got merged. and the former was
merged after
abd9287db0e4f4f7873864119f5ce62519af1d48 . hence the
regression.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b5851648771dcd93251114021005f44a66e602d5 )
Sebastian Wagner [Wed, 3 Feb 2021 15:24:25 +0000 (16:24 +0100)]
mgr/cephadm: cleanup daemon keyring on failed daemon deploy
Fixes: https://tracker.ceph.com/issues/48164
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f200cb26cc0d796c3af583e1d2bf72ec65213cd6 )
Paul Cuzner [Thu, 4 Feb 2021 23:05:05 +0000 (12:05 +1300)]
mgr/cephadm:update test_orchestrator func signature
The available signature has changed to 3 parms, so this
patch is needed to ensure it conforms.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
f6ccd2ebf24d4c2cf6ff073e0ccc735115b758de )
Paul Cuzner [Wed, 3 Feb 2021 19:57:16 +0000 (08:57 +1300)]
mgr/cephadm:toleration fix for API consistency in dashboard
The function signatire change to "available" needed a
patch to the dashboard>orchestratior interface. This patch
just tolerates the change - if or how to consume the
additional data from "available" is yet to be deternined.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
e36e1d20acf4534133bcc14dab62cc5465667a62 )
Paul Cuzner [Wed, 3 Feb 2021 01:45:15 +0000 (14:45 +1300)]
mgr/cephadm:updates to support orch status changes
The available function definition has been updated in
cephadm/rook and Orchestrator base class to provide a
module specific dictionary holding any specific info that
would be pertinent to share with the user. This in turn
changed the _status method for cephadm, but the UX
remains the same (i.e. admin must use --detail to see
the worker pool size).
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
81caa2643ec4a36d6d6185a4fb215eaf4b532aef )
Conflicts:
src/pybind/mgr/rook/module.py
Paul Cuzner [Sun, 24 Jan 2021 21:40:54 +0000 (10:40 +1300)]
mgr/orchestrator: resolve rebase issue
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
7bed9ccf09ee2bf0d799b30525bf064332b1e945 )
Paul Cuzner [Mon, 18 Jan 2021 22:01:08 +0000 (11:01 +1300)]
mgr/orchestrator: rebase including the --detail
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
83a25c5e23b2e4cdc87309ecf41c86483e0c30cd )
Paul Cuzner [Mon, 18 Jan 2021 21:57:14 +0000 (10:57 +1300)]
mgr/orchestrator: removed worker_pool method
The worker_pool_size method has been removed and its
functionality replaced by the cephadm 'available' function to
help keep the interface model generic.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
8c9cd764ee7322dbbb127f70ac522c319d5febcf )
Paul Cuzner [Mon, 18 Jan 2021 21:54:15 +0000 (10:54 +1300)]
mgr/orchestrator: doc updated to show optional parameter
Updated the orch status document to show the --detail option
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
a4f4a67fe79a3140158a9ffaaa659c909896ab07 )
Paul Cuzner [Wed, 23 Dec 2020 04:04:50 +0000 (17:04 +1300)]
mgr/orchestrator: rebase patch
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
4588ad184c4464560c1d5c9b2f5d03da41b2eebb )
Kefu Chai [Sun, 31 Jan 2021 03:58:47 +0000 (11:58 +0800)]
cephadm: drop unicode alias
since we've dropped python 2 support
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
9380de2a8b888e1ec73407ea4b22a96c099b9de2 )
Kefu Chai [Sun, 31 Jan 2021 03:55:25 +0000 (11:55 +0800)]
cephadm: drop support for python<3.3
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
fe4f4402fbcd87667613640f2808d5d0e07e749d )
Kefu Chai [Sun, 31 Jan 2021 03:47:07 +0000 (11:47 +0800)]
cephadm: do not install ipaddress
we dropped py2 env from tox in
c8649eff0097635ad16778d2194b07d139ce806a
so no need to install ipaddress for python<3.3 anymore
this change also silences the warning like:
Ignoring ipaddress: markers 'python_version < "3.3"' don't match your
environment
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b5f4c9ad449131a1084061c99e895640dbbeb61d )
Daniel-Pivonka [Wed, 13 Jan 2021 21:40:52 +0000 (16:40 -0500)]
mgr/cephadm: ok-to-stop for mgr
depends on #38854
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit
96dcb1547c77e03c04accd660defa586825d94cc )
Adam King [Wed, 3 Feb 2021 13:14:07 +0000 (08:14 -0500)]
mgr/orchestrator: useful message when no service type in "ceph orch apply"
Right now it just gives a traceback. A message telling users they have
not provided a proper service type would be more useful
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
b68675b516292ed3a2fb7a9377723fe9049b54ea )
Sage Weil [Wed, 3 Feb 2021 18:22:39 +0000 (12:22 -0600)]
mgr/cephadm: 'drive group' -> 'service'
...and add 'osd.' prefix
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
756bd773d4c6ff57e11c02502fb26f3500f928ad )
Sage Weil [Tue, 2 Feb 2021 23:09:15 +0000 (17:09 -0600)]
mgr/cephadm: only reapply osd spec if devices have changed
This avoids a lot of useless work when the devices have not changed.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b129c1312113f56a227caeb535f656f5a090a85f )
Sage Weil [Tue, 2 Feb 2021 23:07:36 +0000 (17:07 -0600)]
mgr/cephadm: use datetime_now() for last_facts_update
Be consistent!
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
821f7e9d5b5a2d4725c5cea2987e601e07e83558 )
Sage Weil [Tue, 2 Feb 2021 19:46:44 +0000 (13:46 -0600)]
mgr/cephadm: track last_device_change
Keep track of when the device inventory and/or state *changes*.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
2b7d8e16309b12273d2e65ce638c9588528ee1f0 )
Sage Weil [Tue, 2 Feb 2021 18:01:32 +0000 (12:01 -0600)]
mgr/cephadm: track last_applied by host for osd specs
For each host, note when we last applied each osdspec. Log the start
time, not the end time.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
197a8ba22ff30ccf9498bbc14b7a3897e48e1220 )
Sebastian Wagner [Wed, 3 Feb 2021 12:56:09 +0000 (13:56 +0100)]
mgr/cephadm: on ssh connection error, advice chmod 0600
Fixes: https://tracker.ceph.com/issues/46551
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
e3fa11f40ebc28782c65b4f8ee5d69237eb63d7d )
Sage Weil [Fri, 19 Feb 2021 21:43:05 +0000 (16:43 -0500)]
Merge PR #39563 into pacific
* refs/pull/39563/head:
qa/valgrind.supp: suppress free[] warnings
qa/suites: do not use notcmalloc flavor
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 19 Feb 2021 17:04:58 +0000 (09:04 -0800)]
Merge pull request #39433 from liewegas/pr-39404-pacific
pacific: qa/suites/upgrade/octopus-x/stress-split
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Sage Weil [Thu, 18 Feb 2021 18:04:16 +0000 (12:04 -0600)]
qa/valgrind.supp: suppress free[] warnings
This is apparently not going to get fixed any time soon.
https://github.com/gperftools/gperftools/issues/792
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
28fe149ea276693b47cc4d600780971f723672e4 )
Sage Weil [Thu, 18 Feb 2021 22:00:59 +0000 (16:00 -0600)]
qa/suites: do not use notcmalloc flavor
teuthology now knows how to run valgrind against a tcmalloc binary
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
dc64ccf063f1ddf843fae4d2621ec25187f56135 )
# Conflicts:
# qa/suites/rgw/verify/validater/valgrind.yaml
- conflict on commented out line
Ernesto Puerta [Thu, 18 Feb 2021 16:07:47 +0000 (17:07 +0100)]
Merge pull request #39442 from rhcs-dashboard/wip-49270-pacific
pacific: mgr/dashboard: delete EOF when reading passwords from file
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Wed, 17 Feb 2021 20:15:31 +0000 (12:15 -0800)]
Merge pull request #39485 from liewegas/pr-39282-pacific
pacific: osdc,librados: set FULLY_TRY flag by ioctx, not globally
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 17 Feb 2021 19:50:50 +0000 (11:50 -0800)]
Merge pull request #39484 from liewegas/pr-39283-pacific
pacific: qa/suites/rados/dashboard: whitelist TELEMETRY_CHANGED
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Tue, 16 Feb 2021 22:56:10 +0000 (14:56 -0800)]
Merge pull request #39500 from liewegas/pr-39496-pacific
pacific: mgr/cephadm: fix host refresh
Reviewed-by: David Galloway <dgallowa@redhat.com>
Ernesto Puerta [Tue, 16 Feb 2021 19:49:07 +0000 (20:49 +0100)]
Merge pull request #39425 from rhcs-dashboard/wip-49254-pacific
pacific: mgr/dashboard: Automatically refresh crush map metadata table
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Tue, 16 Feb 2021 19:13:49 +0000 (11:13 -0800)]
Merge pull request #39310 from liewegas/pr-39213-pacific
pacific: qa/suites/upgrade/octopus-x/parallel: include cephfs in upgrade cluster
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Sage Weil [Tue, 16 Feb 2021 17:07:08 +0000 (11:07 -0600)]
mgr/cephadm: fix host refresh
Fixes: 01f60cf4e0a751c314120c02956d4ff941eb71b4
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
9df5a6d73ed21b394c01afe6c9800b6e50737c90 )
Patrick Donnelly [Mon, 15 Feb 2021 23:15:35 +0000 (15:15 -0800)]
Merge PR #39437 into pacific
* refs/pull/39437/head:
qa: Fix a few mgr/volume test cases
Reviewed-by: Ramana Raja <rraja@redhat.com>
Sage Weil [Wed, 3 Feb 2021 21:46:22 +0000 (16:46 -0500)]
osdc/Objecter: remove pool_full_try interface
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e468fc0d3b8c5f4d7713e4015d4d7ccbfa5bccf9 )
Sage Weil [Wed, 3 Feb 2021 21:44:11 +0000 (16:44 -0500)]
librados: set FULL_TRY flag on ioctx, not objecter
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a8bed67ad17f8d9114888cd1eba81c05555cfa73 )
Sage Weil [Wed, 3 Feb 2021 21:43:53 +0000 (16:43 -0500)]
librados/IoCtxImpl: pass extra_op_flags everywhere
Unused, so far...
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
68564836ff637ce017755abfa10c1856296dc51d )
Sage Weil [Wed, 3 Feb 2021 23:36:29 +0000 (17:36 -0600)]
qa/suites/rados/dashboard: whitelist TELEMETRY_CHANGED
test_enable_module_empty_license fiddles with this.
Fixes: https://tracker.ceph.com/issues/48990
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
bf5646704c3e565efbb480070e7df5745c89c588 )
Josh Durgin [Mon, 15 Feb 2021 17:52:46 +0000 (09:52 -0800)]
Merge pull request #39232 from liewegas/pr-39212-pacific
pacific: cpatch: updates
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jan Fajerski [Mon, 15 Feb 2021 09:14:49 +0000 (10:14 +0100)]
Merge PR #39222 into pacific
* refs/pull/39222/head:
ceph-volume: Fix usage of is_lv
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Yuri Weinstein [Fri, 12 Feb 2021 18:14:48 +0000 (10:14 -0800)]
Merge pull request #39179 from neha-ojha/wip-49058-pacific
pacific: qa/*/thrash_cache_writeback_proxy_none.yaml: disable writeback overlay tests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 12 Feb 2021 16:17:07 +0000 (08:17 -0800)]
Merge pull request #39228 from ifed01/wip-ifed-fix-pin-pacific
pacific: os/bluestore: fix a bug causing unexpected Onode's unpinned state.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 12 Feb 2021 16:16:25 +0000 (08:16 -0800)]
Merge pull request #39218 from k0ste/wip-49006-pacific
pacific: mgr: update mon metadata when monmap is updated
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Fri, 12 Feb 2021 16:15:31 +0000 (08:15 -0800)]
Merge pull request #39214 from neha-ojha/wip-49087-pacific
pacific: qa/suites/upgrade/nautilus-x-singleton: pin to 18.04
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 12 Feb 2021 16:15:03 +0000 (08:15 -0800)]
Merge pull request #39180 from neha-ojha/wip-48986-pacific
pacific: An empty bucket or OSD is not an error
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sebastian Wagner [Fri, 12 Feb 2021 15:20:55 +0000 (16:20 +0100)]
Merge pull request #39378 from sebastian-philipp/pacific-backport-39172-39097-39095-39143-39106-39200-38911-39069-39208-38927-
pacific: cephadm backport February (1)
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Alfonso Martínez [Tue, 9 Feb 2021 10:17:52 +0000 (11:17 +0100)]
mgr/dashboard: delete EOF when reading passwords from file
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
caeadf1397db00c6b7ba218b1910508099802e39 )
Jason Dillaman [Fri, 12 Feb 2021 13:15:47 +0000 (08:15 -0500)]
Merge pull request #39428 from dillaman/wip-49253-pacific
pacific: librbd: correct incremental deep-copy object-map inconsistencies
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Fri, 12 Feb 2021 13:15:25 +0000 (08:15 -0500)]
Merge pull request #39316 from petrutlucian94/wip-49155-pacific
pacific: Windows RBD fixes
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 Feb 2021 13:15:00 +0000 (08:15 -0500)]
Merge pull request #39305 from dillaman/wip-librbd-backports-pacific-3
pacific: librbd: miscellaneous backports
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Kotresh HR [Fri, 5 Feb 2021 18:05:22 +0000 (23:35 +0530)]
qa: Fix a few mgr/volume test cases
Recovering dirty auth metadata file might not retain the order,
fixed the comparison in 'test_recover_auth_metadata_during_authorize'
and 'test_recover_auth_metadata_during_deauthorize'.
Fixes: https://tracker.ceph.com/issues/49192
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
4952d2132ffd92594e749a652970d5d9415c721d )
Sage Weil [Thu, 4 Feb 2021 18:56:49 +0000 (12:56 -0600)]
qa/suites/upgrade/octopus-x/stress-split: cephadm-based stress-split upgrade
Apply stress during upgrade, and also pause partway and do some
thrashing.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ec90e9b82c540bbdc7194e2cf3c5d864ab918695 )
Ilya Dryomov [Tue, 9 Feb 2021 13:04:39 +0000 (14:04 +0100)]
librbd: journal::StandardPolicy template defaults to ImageCtx
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b90ee634fa2aca4d1223ee19f43d026917aa969d )
Ilya Dryomov [Mon, 8 Feb 2021 16:01:47 +0000 (17:01 +0100)]
librbd: don't hold owner_lock for validate_image_removal()
handle_exclusive_lock() and handle_shut_down_exclusive_lock() call
validate_image_removal() without owner_lock held, so holding it in
shut_down_exclusive_lock() appears to be redundant.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b1bf3eaef200fb5d1aa847cad14936f2bbbf7b64 )
Ilya Dryomov [Sun, 7 Feb 2021 14:09:24 +0000 (15:09 +0100)]
librbd: treat EROFS as expected in handle_acquire_lock()
If the peer refuses to release exclusive lock (e.g. in case automatic
exclusive lock transitions are disabled), EROFS is retured. Suppress
a rather confusing "Read-only file system" error message -- this case
is no different from EBUSY or EAGAIN.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
2f82c98f5a542a69057f3e78d232380eee14eff7 )
Ilya Dryomov [Sun, 7 Feb 2021 12:46:15 +0000 (13:46 +0100)]
librbd: refuse to release exclusive lock when removing
Commit
25c2ffe145be ("librbd: acquire exclusive lock from peer when
removing") changed PreRemoveRequest to request exclusive lock from the
peer instead of giving up and proceeding without exclusive lock. This
caused one of the test cases that sometimes runs concurrent "rbd rm"
against the same image to fail intermittently, most often on assert
ceph_assert(image_ctx.exclusive_lock == nullptr ||
image_ctx.exclusive_lock->is_lock_owner());
because exclusive lock is now automatically transitioned to another
"rbd rm" on its request.
The root cause is older and probably goes back to when synchronous
librbd::remove() which held owner_lock across all operations including
trim_image() was converted to a set of state machines. Since then, any
peer that requests exclusive lock (instead of trying once and backing
off) is able to mess with image removal.
Install StandardPolicy to disable automatic exclusive lock transitions
during image removal.
Fixes: https://tracker.ceph.com/issues/49226
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
707907ea3f6ff39968666af4ba718ceef8cd8953 )
Ilya Dryomov [Mon, 8 Feb 2021 15:49:35 +0000 (16:49 +0100)]
librbd: templatize exclusive_lock::StandardPolicy
This will be used by expect_set_exclusive_lock_policy() in
test_mock_PreRemoveRequest.cc.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
948f3c761dce4678b38d22e240da06434dbe10e4 )
Mahati Chamarthy [Wed, 3 Feb 2021 15:03:50 +0000 (20:33 +0530)]
librbd/cache/pwl: Fix user request completion in
... persist_on_flush mode
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
(cherry picked from commit
d8eb9391c9dd7425053bd91f79eea103ae90cc93 )
Jason Dillaman [Mon, 8 Feb 2021 16:53:28 +0000 (11:53 -0500)]
rbd-mirror: don't prune older mirror snapshots when pruning incomplete snapshot
Since we normally prune in order, we need to ensure that we don't prune older
snapshots when we need to delete an incomplete mirror snapshot since the
older snapshot might be the only remaining mirror snapshot.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7ba9214ea5b73d0436af6c2896abf4836d741de9 )
Jason Dillaman [Mon, 8 Feb 2021 15:13:35 +0000 (10:13 -0500)]
qa/workunits/rbd: show snapshot deltas during stress test failure
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f079116e87161b55acaa08c55bf8b8e79cee8670 )
Jason Dillaman [Fri, 5 Feb 2021 18:33:16 +0000 (13:33 -0500)]
librbd/deep-copy: compute parent overlap before computing zero extents
An object might not overlap with its parent so avoid injecting an empty
object to hide the non-existent parent.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f1c6147623fc7876f7f9cc7beda98d1f7edf9e68 )
Jason Dillaman [Tue, 2 Feb 2021 20:28:48 +0000 (15:28 -0500)]
qa/suites/rbd: add snapshot-based mirroring stress test
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
094bfeaf8efe1c4794a2b301314eddedfa5246f9 )
Jason Dillaman [Fri, 29 Jan 2021 15:44:38 +0000 (10:44 -0500)]
librbd/deep_copy: skip snap list if object is known to be clean
If the fast-diff indicates that the destination object should exist
and that it hasn't changed, there shouldn't be a need to issue the
snap list operation. Instead, just update the destination object map
to indicate the existence of the object.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
235b27a8f08a82fc46efa8b6a3e5cb8a5276956b )
Jason Dillaman [Fri, 29 Jan 2021 02:42:09 +0000 (21:42 -0500)]
librbd/deep_copy: object-copy state machine must update object map
If there was no data to copy, the object-copy state machine was bypassing
the object-map update states and prematurely completing. Since the
object-map is default-initialized to all non-existent objects, this results
in incorrect state for OBJECT_EXISTS_CLEAN objects.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
ca0b9bfc28ef7287ca139ca9640c876223eda87b )
Jason Dillaman [Wed, 3 Feb 2021 18:21:34 +0000 (13:21 -0500)]
librbd/io: track object non-existence when computing snapshot deltas
Re-use the existing DNE state to track whether or not the object
already exists when computing snapshot deltas from an arbitrary
set of snapshots. Previously, the non-existence of the object was
only computed for snap id 0 for tracking whiteouts. In a future
commit, the deep-copy object-copy state machine will be able to
properly update the object-map state to indicate exists clean
vs non-existent state.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
89d2a13db67945bfd7c6d6fe79584f00574b8ba3 )
Jason Dillaman [Wed, 3 Feb 2021 21:23:20 +0000 (16:23 -0500)]
librbd/io: minor reorganization for object list-snaps
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a75c8a0abdb43a60dd7eeb3b405f6b30481cf321 )
Jason Dillaman [Wed, 3 Feb 2021 15:13:28 +0000 (10:13 -0500)]
librbd/io: only track initial diff extents if no diffs exists
The purpose of the initial diff extents ({0, 0}) was to help track
whether or not objects exists for read-from-parent / whiteout
tracking. Once we have at least one set of diffs on the object, we
actually have enough information to know about the object state.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
688cbf3da38025b48be1e308f79170c40f0760d3 )
Jason Dillaman [Thu, 28 Jan 2021 23:30:16 +0000 (18:30 -0500)]
librbd/object_map: diff state machine should track object existence
The deep-copy snapshot-create state machine initializes the object-map
state to non-existent for all objects. There was an assumption that the
deep-copy object-copy state machine would always update the object map
but that was being skipped for clean objects as an optimization. This
change will support a future commit to run the object-copy state machine
for existing objects.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b81cd2460de748c71210520f8c819895f257f0c7 )
Nizamudeen A [Tue, 19 Jan 2021 12:35:43 +0000 (18:05 +0530)]
mgr/dashboard: Automatically refresh the crush map metadata table
If we make any change to the osd crush map like do an osd crush reweight from cli, for that change to be reflected on metadata table we need to reload the entire page. Instead this PR takes care of auto refreshing the tree view.
Fixes: https://tracker.ceph.com/issues/48922
Signed-off-by: Nizamudeen A <nia@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
bc8562ef2a17b78e80bd4e1272d3fd1a512249bb )
Guillaume Abrioux [Thu, 11 Feb 2021 07:49:03 +0000 (08:49 +0100)]
Merge pull request #39272 from jan--f/wip-49142-pacific
pacific: ceph-volume: add some flexibility to bytes_to_extents
Neha Ojha [Thu, 11 Feb 2021 02:06:18 +0000 (18:06 -0800)]
Merge pull request #39403 from neha-ojha/wip-49228-pacific
pacific: Revert "qa/tasks/cephadm: use cluster.sh and remote.sh for better readibility"
Reviewed-by: Sage Weil <sage@redhat.com>
Neha Ojha [Tue, 9 Feb 2021 22:10:19 +0000 (22:10 +0000)]
Revert "qa/tasks/cephadm: use cluster.sh and remote.sh for better readibility"
This reverts commit
6d7ba1180e66df2d6dee3a01fe3e12cafaa6fe8c .
Fixes: https://tracker.ceph.com/issues/49228
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
3ced450cdd7a1f4083a19dd29b2d27e03883ab52 )
Sebastian Wagner [Fri, 29 Jan 2021 10:10:38 +0000 (11:10 +0100)]
mgr/cephadm: Add strings to assert statements
This helps with: https://tracker.ceph.com/issues/48981
Looks like there is an assert somewhere:
```
Error EINVAL: Traceback (most recent call last):
File "/usr/share/ceph/mgr/mgr_module.py", line 1269, in _handle_command
return self.handle_command(inbuf, cmd)
...snip...
File "/usr/share/ceph/mgr/orchestrator/module.py", line 550, in _list_services
raise_if_exception(completion)
File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 653, in raise_if_exception
raise e
AssertionError
```
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
06f4d84166f9c0761ace002fa2091dcd1d78f2d6 )