]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/cephadm:Unit tests updated to account for upgrades
Paul Cuzner [Thu, 18 Feb 2021 03:09:27 +0000 (16:09 +1300)]
mgr/cephadm:Unit tests updated to account for upgrades

Upgrades may change the config checks, so the tests now validate
that new checks and old bogus checks are handled correctly

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit bf02fb98bb7159baa376010fa6daae0a3ebbddb2)

4 years agomgr/cephadm:Updates to CephadmConfigChecks class
Paul Cuzner [Tue, 16 Feb 2021 23:49:41 +0000 (12:49 +1300)]
mgr/cephadm:Updates to CephadmConfigChecks class

Multiple updates to ensure
- mgr health checks are raised correctly
- checks are independent and may be disabled

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 13713b5caaca151f7b45e5ef27eccd028778efd7)

4 years agomgr/cephadm:Adds unit tests for the CephadmConfigChecks class
Paul Cuzner [Tue, 16 Feb 2021 23:45:38 +0000 (12:45 +1300)]
mgr/cephadm:Adds unit tests for the CephadmConfigChecks class

Add unit tests to test suite to verify functionality. The unit tests use
a sample host definition and scale that to simulate a cluster to run
the tests against

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 4b1b136d3e97e39936f3e3bd94e2106dc6e42c73)

4 years agomgr/cephadm:add module option to enable configuration checks
Paul Cuzner [Tue, 16 Feb 2021 23:43:02 +0000 (12:43 +1300)]
mgr/cephadm:add module option to enable configuration checks

Adds config_checks_enabled (bool) option

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit fae0adf4f07d8af0d3cb0b9d0eb4c3da14a2cf78)

4 years agomgr/cephadm:added ceph version consistency check
Paul Cuzner [Thu, 11 Feb 2021 00:03:59 +0000 (13:03 +1300)]
mgr/cephadm:added ceph version consistency check

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit bcd6acf4a6ff137d98dbaa28aff4927c1075979f)

4 years agomgr/cephadm: added config checker to main serve loop
Paul Cuzner [Wed, 10 Feb 2021 22:31:22 +0000 (11:31 +1300)]
mgr/cephadm: added config checker to main serve loop

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3ea8eaf9b5e0e60edd06da927e3c6f375687dbb1)

4 years agomgr/cephadm: adding check logic
Paul Cuzner [Wed, 10 Feb 2021 22:30:05 +0000 (11:30 +1300)]
mgr/cephadm: adding check logic

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 5a555ba93854bc8cf7cfd7ead23509fa5782374a)

4 years agomgr/cephadm: resolve rebase conflicts
Paul Cuzner [Tue, 9 Feb 2021 19:49:31 +0000 (08:49 +1300)]
mgr/cephadm: resolve rebase conflicts

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 80a9d71d3cd3add8039a52c2ba3efe4388a5185b)

4 years agomgr/cephadm:Document the intergration with libstoragemgmt
Paul Cuzner [Wed, 3 Mar 2021 00:12:05 +0000 (13:12 +1300)]
mgr/cephadm:Document the intergration with libstoragemgmt

Updates the cephadm osd documentation to include details about
including integration with libstoragement - including the potential
hardware issues that may arise.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3b6f21834128bdb1eb763c5fce351b113963fa66)

4 years agomgr/cephadm:Enable cephadm device scan to use LSM
Paul Cuzner [Mon, 22 Feb 2021 01:35:03 +0000 (14:35 +1300)]
mgr/cephadm:Enable cephadm device scan to use LSM

Using libstoragemgmt (LSM) in ceph-volume was disabled by default,
(nov 2020) which meant cephadm's inventory never had a way to
request the LSM data. This patch adds a module option called
'device_enhanced_scan' (bool), that if set will append the
--with-lsm parameter to the ceph-volume inventory call.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3105fa254b70f0fb56c86eb110580108dcd03509)

4 years agomgr/cephadm: prevent traceback when invalid osd id passed to 'orch osd rm stop'
Daniel Pivonka [Mon, 8 Mar 2021 19:04:29 +0000 (14:04 -0500)]
mgr/cephadm: prevent traceback when invalid osd id passed to 'orch osd rm stop'

orch osd rm exepcts a str that can be converted to an int passed to it
if the user passed something that cant be converted it shows a traceback
catching the ValueError prevents this traceback.

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 6e8adcfee6ef8996badac3167007b6c76e33a2e4)

4 years agomgr/cephadm: do not prime service cache on reconfig
Sage Weil [Tue, 9 Mar 2021 18:15:20 +0000 (12:15 -0600)]
mgr/cephadm: do not prime service cache on reconfig

Ceph daemon reconfig does not need any daemon state refresh since we don't
do a restart--we just rewrite the ceph.conf.  This also avoids priming
our cache with a 'starting' state when the daemon wasn't touched.

Fixes: https://tracker.ceph.com/issues/49675
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 248cb6a76ff52a4e5b5758b97a0d6cd812d9f9f5)

4 years agomgr/cephadm/osd: PEP-8 fix
Sebastian Wagner [Tue, 2 Mar 2021 11:22:47 +0000 (12:22 +0100)]
mgr/cephadm/osd: PEP-8 fix

Otherwise `tox -e fix` will continue to
create this hunk

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bf9d5cb52e8c7d47ea75f3a6f193fbc198bc08b6)

4 years agomgr/cephadm: Activate existing OSDs
Sebastian Wagner [Tue, 23 Feb 2021 11:24:06 +0000 (12:24 +0100)]
mgr/cephadm: Activate existing OSDs

Adds `ceph cephadm osd activate`

Fixes: https://tracker.ceph.com/issues/49159
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 50295a65a177dbc0803fe5af92459d51d9aff71a)

4 years agomgr/cephadm: osd: Use _run_cephadm_json()
Sebastian Wagner [Tue, 23 Feb 2021 10:30:36 +0000 (11:30 +0100)]
mgr/cephadm: osd: Use _run_cephadm_json()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 555cada8e554e7ec5707bae0d69336af9fe4ae51)

4 years agomgr/cephadm: document ok_to_stop output argument for clarity
Sage Weil [Thu, 4 Mar 2021 17:01:28 +0000 (12:01 -0500)]
mgr/cephadm: document ok_to_stop output argument for clarity

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2a1c3997cdb3c046bf8db2b257e28b4cb56abfeb)

4 years agomgr/DaemonServer: make warning language a bit friendlier
Sage Weil [Fri, 26 Feb 2021 17:14:09 +0000 (12:14 -0500)]
mgr/DaemonServer: make warning language a bit friendlier

This message is shown during the upgrade process.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit fb778a3205801a49e4f9c4d3bd24e07dfb410a44)

4 years agomgr/cephadm/upgrade: improve language a bit
Sage Weil [Fri, 26 Feb 2021 17:12:24 +0000 (12:12 -0500)]
mgr/cephadm/upgrade: improve language a bit

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit bae8394c5e35b52b2cfaabfe79148a490efdf2dc)

4 years agomgr/cephadm/upgrade: restart multiple osds at once
Sage Weil [Fri, 26 Feb 2021 16:53:54 +0000 (11:53 -0500)]
mgr/cephadm/upgrade: restart multiple osds at once

Restart multiple osds in a single upgrade pass, when possible.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b3d0420e60bcaede1d253bd551f201e756cc3d9a)

4 years agomgr/cephadm: gather other osds that are safe to stop
Sage Weil [Fri, 26 Feb 2021 16:50:51 +0000 (11:50 -0500)]
mgr/cephadm: gather other osds that are safe to stop

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 075d6fc18858bb552ed1a020d7971578680c4104)

4 years agomgr/cephadm: optional pass 'known' through to ok_to_stop
Sage Weil [Fri, 26 Feb 2021 13:46:26 +0000 (08:46 -0500)]
mgr/cephadm: optional pass 'known' through to ok_to_stop

Optionally provide a list of previously known-to-be-ok-to-stop items to
the ok_to_stop method. This has to get plumbed through a zillion instances
of this class method.

No functional change (yet).

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d9da769079a6a78efd1016af28e7bcf0b8ab830c)

4 years agomgr/cephadm/upgrade: log start/stop/pause/resume
Sage Weil [Fri, 26 Feb 2021 14:15:39 +0000 (09:15 -0500)]
mgr/cephadm/upgrade: log start/stop/pause/resume

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 94b190d4a567ed65ece8aa1981f3aeaa59a292e7)

4 years agomgr/cephadm: add CEPHADM_STRAY_DAEMON unittest
Michael Fritch [Thu, 4 Mar 2021 20:48:35 +0000 (13:48 -0700)]
mgr/cephadm: add CEPHADM_STRAY_DAEMON unittest

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 88dc55266958d77ffa1da34a3d20c039cb249ac5)

4 years agomgr/cephadm: alias rgw-nfs -> nfs
Michael Fritch [Wed, 3 Mar 2021 22:44:26 +0000 (15:44 -0700)]
mgr/cephadm: alias rgw-nfs -> nfs

RGW will register a daemon_type `rgw-nfs` which needs to map to
the corresponding cephadm nfs daemon to avoid stray daemon warnings

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0f237223accbea49cf9792400a657cbf696a5d67)

4 years agoqa/tasks/cephadm: remove mirror code
Sage Weil [Wed, 3 Mar 2021 18:35:07 +0000 (12:35 -0600)]
qa/tasks/cephadm: remove mirror code

This is being done from ansible now.  Also, it breaks when
the conf file has unqualified-search-registries but not 'registry'
entries.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 208407c5c05e29c33d9decdba9455bdc2fe32e90)

4 years agocephadm: fixup `alrady` -> `already`
Michael Fritch [Thu, 25 Feb 2021 15:12:46 +0000 (08:12 -0700)]
cephadm: fixup `alrady` -> `already`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d6323e3e01208967a511c246337cfef18cbf141e)

4 years agocephadm: Change outer quotes to avoid escaping inner quotes (Q003)
Michael Fritch [Thu, 25 Feb 2021 15:12:37 +0000 (08:12 -0700)]
cephadm: Change outer quotes to avoid escaping inner quotes (Q003)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 55788a0bdb1220d2b2df758579366030c8e27947)

4 years agocephadm: Remove bad quotes from multiline string (Q001)
Michael Fritch [Thu, 25 Feb 2021 15:12:24 +0000 (08:12 -0700)]
cephadm: Remove bad quotes from multiline string (Q001)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3b8656d496237651971332ccc29f40baad6883ee)

4 years agocephadm: Remove bad quotes (Q000)
Sage Weil [Mon, 15 Mar 2021 21:46:44 +0000 (16:46 -0500)]
cephadm: Remove bad quotes (Q000)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6ca31b99e14f4c5518ad348b0b30392f108f5a6a)

# Conflicts:
# src/cephadm/cephadm
  - some ' quotes were already in pacific

4 years agocephadm: introduce flake8-quotes
Michael Fritch [Wed, 24 Feb 2021 20:48:37 +0000 (13:48 -0700)]
cephadm: introduce flake8-quotes

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 49f25f56ae44b2b8d185e866d75cb7a5041c8dcc)

4 years agocephadm: line break after binary operator (W504)
Michael Fritch [Fri, 19 Feb 2021 15:09:49 +0000 (08:09 -0700)]
cephadm: line break after binary operator (W504)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7ac0479726b5d9ae925faff3c221f50e39547dd2)

4 years agocephadm: blank line contains whitespace (W293)
Sage Weil [Mon, 15 Mar 2021 21:45:52 +0000 (16:45 -0500)]
cephadm: blank line contains whitespace (W293)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 06e02b73c7c1ec20d6594cdc792c5643cdd06b5f)

# Conflicts:
# src/cephadm/cephadm
 whitespace

4 years agocephadm: trailing whitespace (W291)
Sage Weil [Mon, 15 Mar 2021 21:45:32 +0000 (16:45 -0500)]
cephadm: trailing whitespace (W291)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1870056fa50c833d9ab545a35437013bf4bea74a)

# Conflicts:
# src/cephadm/cephadm
  - whitespace

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agocephadm: local variable 'e' is assigned to but never used (F841)
Michael Fritch [Fri, 19 Feb 2021 15:09:22 +0000 (08:09 -0700)]
cephadm: local variable 'e' is assigned to but never used (F841)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ec56db113f28d59cf5baf833be2a77aa8eeb5863)

4 years agocephadm: 'select' imported but unused (F401)
Michael Fritch [Fri, 19 Feb 2021 15:09:08 +0000 (08:09 -0700)]
cephadm: 'select' imported but unused (F401)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit bb0331841408cbcf7c1835974cdb77694d56fdc6)

4 years agocephadm: ambiguous variable name 'l' (E741)
Michael Fritch [Thu, 18 Feb 2021 22:30:02 +0000 (15:30 -0700)]
cephadm: ambiguous variable name 'l' (E741)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit c58701642dad678f6cf3ff946b10fc2a78b053c0)

4 years agocephadm: do not use bare 'except' (E722)
Michael Fritch [Thu, 18 Feb 2021 22:25:27 +0000 (15:25 -0700)]
cephadm: do not use bare 'except' (E722)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8eb4c38f10251386b190194dd12f2787b083e383)

4 years agocephadm: statement ends with a semicolon (E703)
Michael Fritch [Thu, 18 Feb 2021 22:24:03 +0000 (15:24 -0700)]
cephadm: statement ends with a semicolon (E703)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6237df7527b0384b2c1d47d17369e58cf9c5b0a4)

4 years agocephadm: module level import not at top of file (E402)
Sage Weil [Mon, 15 Mar 2021 21:43:48 +0000 (16:43 -0500)]
cephadm: module level import not at top of file (E402)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9bbb35958cca8f8f72da324aa35f4d631e8c31a4)

# Conflicts:
# src/cephadm/cephadm
  - top definitions moved; kept pacific and is_master=False in place

4 years agocephadm: expected 1 blank line before a nested definition (E306)
Michael Fritch [Thu, 18 Feb 2021 22:15:48 +0000 (15:15 -0700)]
cephadm: expected 1 blank line before a nested definition (E306)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6c8ea9fb65cb63db0aac4d53d507e21a0f85d726)

4 years agocephadm: expected 2 blank lines after end of function or class (E305)
Michael Fritch [Thu, 18 Feb 2021 22:13:57 +0000 (15:13 -0700)]
cephadm: expected 2 blank lines after end of function or class (E305)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit cf9e974284e34cc71438cf9ce0eac19e77e911b8)

4 years agocephadm: too many blank lines (E303)
Michael Fritch [Thu, 18 Feb 2021 22:12:50 +0000 (15:12 -0700)]
cephadm: too many blank lines (E303)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f1af846c60598b573697ba2c55266ae88087227b)

4 years agocephadm: expected 2 blank lines, found 1 (E302)
Sage Weil [Mon, 15 Mar 2021 21:42:06 +0000 (16:42 -0500)]
cephadm: expected 2 blank lines, found 1 (E302)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dea779803445cc83fa0a63570d0068f572ccbd20)

# Conflicts:
# src/cephadm/cephadm
  - whitespace

4 years agocephadm: expected 1 blank line, found 0 (E301)
Michael Fritch [Thu, 18 Feb 2021 22:04:42 +0000 (15:04 -0700)]
cephadm: expected 1 blank line, found 0 (E301)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 858b55c3acd0380565c7a2f565614d2ac61a3d13)

4 years agocephadm: too many leading '#' for block comment (E266)
Sage Weil [Mon, 15 Mar 2021 21:41:48 +0000 (16:41 -0500)]
cephadm: too many leading '#' for block comment (E266)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3dcb56e3e31d11041a48c2749bb248240bb14134)

# Conflicts:
# src/cephadm/cephadm
  - whitespacea roudn comment

4 years agocephadm: block comment should start with '# ' (E265)
Michael Fritch [Wed, 17 Feb 2021 15:23:44 +0000 (08:23 -0700)]
cephadm: block comment should start with '# ' (E265)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 20c5f3d186f606ec4a5b66b6edd3f3c0056a8a27)

4 years agocephadm: at least two spaces before inline comment (E261)
Michael Fritch [Wed, 17 Feb 2021 15:18:31 +0000 (08:18 -0700)]
cephadm: at least two spaces before inline comment (E261)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6d937393f872a484d1a4c80a72b327b7280278e3)

4 years agocephadm: unexpected spaces around keyword / parameter equals (E251)
Michael Fritch [Wed, 17 Feb 2021 04:10:36 +0000 (21:10 -0700)]
cephadm: unexpected spaces around keyword / parameter equals (E251)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d47b26d792cfff7c64c78e781e7e38494f9a4c85)

4 years agocephadm: multiple spaces after ',' (E241)
Michael Fritch [Wed, 17 Feb 2021 04:08:39 +0000 (21:08 -0700)]
cephadm: multiple spaces after ',' (E241)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2bb74a8964ecb0f995874335e20a7f2fda1b3f1)

4 years agocephadm: missing whitespace after ':' (E231)
Michael Fritch [Wed, 17 Feb 2021 04:05:04 +0000 (21:05 -0700)]
cephadm: missing whitespace after ':' (E231)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3e3ace6f31ce5758dc56150f762f9d2e2ca41301)

4 years agocephadm: missing whitespace around arithmetic operator (E226)
Michael Fritch [Wed, 17 Feb 2021 03:56:03 +0000 (20:56 -0700)]
cephadm: missing whitespace around arithmetic operator (E226)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 549258b4c6fe3945acdd03eeedab5070d1d81d01)

4 years agocephadm: missing whitespace around operator (E225)
Sage Weil [Mon, 15 Mar 2021 21:40:57 +0000 (16:40 -0500)]
cephadm: missing whitespace around operator (E225)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2af78e9358838d04c9b92ee76736de53466a11f6)

# Conflicts:
# src/cephadm/cephadm
 - whitespace mismatch

4 years agocephadm: whitespace before ':' (E203)
Michael Fritch [Wed, 17 Feb 2021 03:50:10 +0000 (20:50 -0700)]
cephadm: whitespace before ':' (E203)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f2f76a25179743f46bd9981d141fc8277799addd)

4 years agocephadm: whitespace after '{' (E201)
Michael Fritch [Wed, 17 Feb 2021 03:47:39 +0000 (20:47 -0700)]
cephadm: whitespace after '{' (E201)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9e4fd38f32e8a972d64eda66a2a8623ea8bde179)

4 years agocephadm: continuation line unaligned for hanging indent (E131)
Michael Fritch [Wed, 17 Feb 2021 03:46:19 +0000 (20:46 -0700)]
cephadm: continuation line unaligned for hanging indent (E131)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 5ba2b30f788aa5001e0ec6a5fb168be5e8b59bad)

4 years agocephadm: continuation line under-indented for visual indent (E128)
Michael Fritch [Wed, 17 Feb 2021 03:38:37 +0000 (20:38 -0700)]
cephadm: continuation line under-indented for visual indent (E128)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4611df9669f1ec78d62fcb8c2b475d2e4c3467d3)

4 years agocephadm: continuation line over-indented for visual indent (E127)
Michael Fritch [Wed, 17 Feb 2021 03:18:50 +0000 (20:18 -0700)]
cephadm: continuation line over-indented for visual indent (E127)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 460e6e84aa433559ae63fb0f13fb1e9d0df82385)

4 years agocephadm: continuation line over-indented for hanging indent (E126)
Sage Weil [Mon, 15 Mar 2021 21:39:28 +0000 (16:39 -0500)]
cephadm: continuation line over-indented for hanging indent (E126)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit fa2b17c8ecffb1c91c3e9f34ff0e7eea0f09ba3b)

# Conflicts:
# src/cephadm/cephadm
 - master has trailing whitespace; pacific did not

4 years agocephadm: continuation line with same indent as next logical line (E125)
Michael Fritch [Tue, 2 Mar 2021 20:50:10 +0000 (13:50 -0700)]
cephadm: continuation line with same indent as next logical line (E125)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0d57f5496e0b4b486e4c723d150f789b58c960e7)

4 years agocephadm: closing bracket does not match visual indentation (E124)
Michael Fritch [Fri, 12 Feb 2021 16:20:49 +0000 (09:20 -0700)]
cephadm: closing bracket does not match visual indentation (E124)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 91b54fcabcdac2c6ce7af8a934a5292cf252d608)

4 years agocephadm: ... does not match indentation of opening bracket's line (E123)
Michael Fritch [Fri, 12 Feb 2021 16:11:38 +0000 (09:11 -0700)]
cephadm: ... does not match indentation of opening bracket's line (E123)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0b3943a87c0345214ed1a604f389cf0b43610b5e)

4 years agocephadm: continuation line missing indentation or outdented (E122)
Michael Fritch [Fri, 12 Feb 2021 16:09:47 +0000 (09:09 -0700)]
cephadm: continuation line missing indentation or outdented (E122)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 15e4b78abbf3d40b44bbb6b146a3c4648afca158)

4 years agocephadm: continuation line under-indented for hanging indent (E121)
Michael Fritch [Fri, 12 Feb 2021 16:03:30 +0000 (09:03 -0700)]
cephadm: continuation line under-indented for hanging indent (E121)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 75cf5fc676b9d2ef778ba238e76134cfce1621f2)

4 years agocephadm: over-indented (E117)
Michael Fritch [Fri, 12 Feb 2021 16:02:17 +0000 (09:02 -0700)]
cephadm: over-indented (E117)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8187eb97c7f0d87de7b0bc2905f13dc140a75448)

4 years agocephadm: introduce flake8
Michael Fritch [Fri, 12 Feb 2021 15:59:07 +0000 (08:59 -0700)]
cephadm: introduce flake8

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 78916a499c5d8c1cef46613859152f16bdaa669f)

4 years agoMerge PR #39957 into pacific
Sage Weil [Mon, 15 Mar 2021 22:42:27 +0000 (17:42 -0500)]
Merge PR #39957 into pacific

* refs/pull/39957/head:
PendingReleaseNotes: document option osd_fast_shutdown_notify_mon
osd: add osd_fast_shutdown_notify_mon option (default false)

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #39983 into pacific
Sage Weil [Mon, 15 Mar 2021 22:41:59 +0000 (17:41 -0500)]
Merge PR #39983 into pacific

* refs/pull/39983/head:
mgr/dashboard:test prometheus rules through promtool

Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge PR #40077 into pacific
Sage Weil [Mon, 15 Mar 2021 22:41:20 +0000 (17:41 -0500)]
Merge PR #40077 into pacific

* refs/pull/40077/head:
test: Add test for scrub parallelism
osd: Try other PGs when reservation failures occur

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39950 from dillaman/wip-librbd-backports-pacific-8
Jason Dillaman [Mon, 15 Mar 2021 20:54:08 +0000 (16:54 -0400)]
Merge pull request #39950 from dillaman/wip-librbd-backports-pacific-8

pacific: librbd: miscellaneous backports

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agolibrbd: crypto format api semantics change 39950/head
Or Ozeri [Tue, 9 Mar 2021 20:14:49 +0000 (22:14 +0200)]
librbd: crypto format api semantics change

This commit alters the semantics of the encryption format api
to also load the encryption after format completes.
Additionally, several other small changes in librbd crypto are included,
in preparation of supporting clone formatting.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
(cherry picked from commit bb8c66772abaa5890f4caa23bda0eb2ad3279221)

4 years agoMerge PR #39851 into pacific
Sage Weil [Sat, 13 Mar 2021 15:34:22 +0000 (09:34 -0600)]
Merge PR #39851 into pacific

* refs/pull/39851/head:
mgr/dashboard: report mgr fsid

Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge PR #39870 into pacific
Sage Weil [Sat, 13 Mar 2021 15:33:44 +0000 (09:33 -0600)]
Merge PR #39870 into pacific

* refs/pull/39870/head:
mgr/dashboard: Fix missing root path of each session for CephFS

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge PR #40076 into pacific
Sage Weil [Sat, 13 Mar 2021 15:33:19 +0000 (09:33 -0600)]
Merge PR #40076 into pacific

* refs/pull/40076/head:
cephadm: use image id, not name, when inspecting for RepoDigests

Reviewed-by: Adam King <adking@redhat.com>
4 years agocephadm: use image id, not name, when inspecting for RepoDigests 40076/head
Sage Weil [Thu, 11 Mar 2021 21:56:52 +0000 (16:56 -0500)]
cephadm: use image id, not name, when inspecting for RepoDigests

The name is ambiguous, but the image_id is not!  This fixes problems
during upgrade where upgrade thinks the container is upgraded (due to
an incorrect digest) when in fact it is not.

Fixes: 0826c45e0cb5d60fcf8cd71cd14edd34a6997cd4
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f6e802a0d865f64c5e408bdef8e6c3153b1e9842)

4 years agotest: Add test for scrub parallelism 40077/head
David Zafman [Fri, 15 Jan 2021 04:40:04 +0000 (20:40 -0800)]
test: Add test for scrub parallelism

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit dd63577ab372d1d4b2da284c6e506603b293d85d)

4 years agoosd: Try other PGs when reservation failures occur
David Zafman [Fri, 15 Jan 2021 04:39:32 +0000 (20:39 -0800)]
osd: Try other PGs when reservation failures occur

Fixes: https://tracker.ceph.com/issues/48843
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 08c3ede0844507074de2b43638423c094976b493)

4 years agoMerge pull request #39977 from singuliere/wip-49054-pacific
Yuri Weinstein [Thu, 11 Mar 2021 18:40:12 +0000 (10:40 -0800)]
Merge pull request #39977 from singuliere/wip-49054-pacific

pacific: common/mempool: Improve mempool shard selection

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39952 from rzarzynski/wip-tool-nul-in-rados-pacific
Yuri Weinstein [Thu, 11 Mar 2021 18:38:58 +0000 (10:38 -0800)]
Merge pull request #39952 from rzarzynski/wip-tool-nul-in-rados-pacific

pacific: tools/rados: add support for binary object names in the rados CLI

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39951 from rzarzynski/wip-librados-nul-objname-pacific
Yuri Weinstein [Thu, 11 Mar 2021 18:38:25 +0000 (10:38 -0800)]
Merge pull request #39951 from rzarzynski/wip-librados-nul-objname-pacific

 pacific: librados, tests: allow to list objects with the NUL character in names

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39898 from singuliere/wip-49038-pacific
Yuri Weinstein [Thu, 11 Mar 2021 18:37:40 +0000 (10:37 -0800)]
Merge pull request #39898 from singuliere/wip-49038-pacific

pacific: blk/kernel: fix io_uring got (4) Interrupted system call

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #39881 from singuliere/wip-49384-pacific
Yuri Weinstein [Thu, 11 Mar 2021 18:36:48 +0000 (10:36 -0800)]
Merge pull request #39881 from singuliere/wip-49384-pacific

pacific: os/bluestore/BlueFS: use iterator_impl::copy instead of bufferlist::c_str() to avoid bufferlist rebuild

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #39807 into pacific
Sage Weil [Wed, 10 Mar 2021 20:27:27 +0000 (14:27 -0600)]
Merge PR #39807 into pacific

* refs/pull/39807/head:
cephadm: split custom container args into argv
cephadm: fix escaping/quoting of stderr-prefix arg for ceph daemons
cephadm: set CEPH_USE_RANDOM_NONCE if using --init
msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
Revert "Merge PR #39482 into master"
cephadm: remove redundant `ERROR` during check-host
cephadm: remove unused imports
cephadm: `cephadm ls` broken for SUSE downstream alertmanager container
cephadm: `cephadm ls` broken for SUSE downstream alertmanager container
mgr/cephadm: add ok-to-stop functions for ceph client services
mgr/test_orchestrator: Refactor create_osds
mgr/volumes: adapt to now orch interface
doc/mgr/orchestrator_modules: adapt to now orch interface
mgr/selftest: adapt to now orch interface
mgr/dashboard: adapt to now orch interface
mgr/mds_autoscaler: Add to tox.ini
mgr/mds_autoscaler: adapt to now orch interface
mgr/test_orchestrator: adapt to now orch interface
mgr/rook: Adapt to new orch interface
mgr/cephadm: Adapt cephadm to new orch interface
mgr/orch: Remove old tests
mgr/orch: adapt orchestrator CLI to new interface
mgr/orch: replace Completion with OrchResult(Generic[T])
mgr/orchestrator: Fix ceph orch ls in Rook
doc/cephadm: rewrite "install cephadm"
doc/cephadm: rewrite "b.strap a new cluster"
cephadm: add docker.service dependency in systemd units
cephadm: add multi-digest test
mgr/orchestrator: validate config options at apply time
mgr/cephadm: disallow managed options in ServiceSpec config section
mgr/cephadm: add config section to ServiceSpec
doc/cephadm: s/togeter/together
cephadm: provide meta during bootstrap
mgr/cephadm: put service_name in unit.meta and use it when available
cephadm: accept arbitrary dict via --meta-json
mgr/cephadm: incorporte memory_{usage,request,limit} from 'ls'
cephadm: accept --memory-{request,limit}
cephadm: include memory_usage in 'ls' output
doc/cephadm: remove Orchestrator CLI from cephadm toc
doc/cephadm: move host labels to host mgmt
doc/cephadm: group MDS sections into one chapter
doc/cephadm: Add iscsi
doc/cephadm: group NFS sections into one chapter
doc/cephadm: rename monitoring chapter title
doc/cephadm: group MON sections into one chapter
doc/cephadm: make custom containers its own chapter
doc/cephadm: group RGW mgmt sections into one chapter
doc/cephadm: move scheduler topic to service mgmt
doc/cephadm: move unmanaged=true to service-mgmt.rst
doc/cephadm: group general service mgmt sections into one chapter
doc/cephadm: group OSD mgmt sections into one chapter
doc/cephadm: Move FQDN chapter to host mgmt.rst
doc/cephadm: Move SSH config from operations to host-mgmt.rst
doc/cephadm: group host mgmt sections into one chapter
cephadm: fix bug in orphan-initial-daemons logic
mgr/orch: drop __all__ from __init__.py
mgr/cephadm: add DaemonDescriptionStatus
cephadm: version command hide traceback when login is needed
doc/cephadm: troubleshooting: manually deploy MGR
cephadm: fix port_in_use when IPv6 is disabled
cephadm: Allow to use paths in all <_devices> drivegroup sections
mgr/cephadm: error if service action called with daemonless service
mgr/cephadm: fix up the strings reporting osd ids
mgr/cephadm: remove daemon before osd destroy/purge
mgr/cephadm: simplify OSD __str__ for drain
mgr/cephadm: make drain adjust crush weight if not replacing
mgr/cephadm: less log noise from osd drain code
mgr/cephadm: fix 'orch daemon add osd ...'
mgr/cephadm/upgrade: fix typo
mgr/cephadm: remove spec from CephadmDaemonDeploySpec
mgr/cephadm/upgrade: restart mgr after mons upgrade to pacific
mgr/cephadm: use get_foreign_ceph_option() instead of 'config get' mon command

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoqa/suites/krbd: bump scratch image size to 15G
Ilya Dryomov [Wed, 24 Feb 2021 10:41:24 +0000 (11:41 +0100)]
qa/suites/krbd: bump scratch image size to 15G

Allow generic/038 and generic/048 to run.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 37d56e13544fa06b88196b1a4d6edd1b3425325e)

4 years agoqa/suites/krbd: exclude ext4/002
Ilya Dryomov [Fri, 26 Feb 2021 12:54:49 +0000 (13:54 +0100)]
qa/suites/krbd: exclude ext4/002

ext4/002 exercises obsolete EXT4_EOFBLOCKS_FL feature that was removed
in kernel 5.7 and therefore always fails.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d2bdf0ac43a35f755ea70103f497625d882a4592)

4 years agoqa/tasks/rbd: fix xfstests_branch/url example
Ilya Dryomov [Sat, 27 Feb 2021 13:58:45 +0000 (14:58 +0100)]
qa/tasks/rbd: fix xfstests_branch/url example

- don't mention xfstests_branch together with xfstests_url as
  xfstests_branch gets superseded by xfstests_url
- make xfstests_url example more clear

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ec36d501ed5f875d26d1362ec097187697170a4d)

4 years agoMerge pull request #39943 from rhcs-dashboard/wip-49665-pacific
Ernesto Puerta [Wed, 10 Mar 2021 17:17:57 +0000 (18:17 +0100)]
Merge pull request #39943 from rhcs-dashboard/wip-49665-pacific

pacific: mgr/dashboard: Host Maintenance Feature

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agolibrbd/cache/pwl: Fix IO completion
Mahati Chamarthy [Thu, 11 Feb 2021 10:24:30 +0000 (15:54 +0530)]
librbd/cache/pwl: Fix IO completion

- Fix deep copy tests and discard I/O completion

- Change read extents to a pointer so that data
persists when multiple extents are pushed into the
vector of bufferlists

- Cleanup tests

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
(cherry picked from commit eeb0b405044bfaade49da0cc635bc05fb0286c0f)

4 years agomgr/dashboard: Host Maintenance Feature 39943/head
Nizamudeen A [Tue, 2 Feb 2021 12:26:13 +0000 (17:56 +0530)]
mgr/dashboard: Host Maintenance Feature

In Cluster -> Hosts, I've added additional button to put the selected host on maintenance or exit out of the maintenance mode. Also for some hosts the ok-to-stop tests may trigger some warnings which requires a --force command to pass along with the maintenance enter command to enter a host into maintenance. In UI this is achieved using a confirmation Modal. In addition to this if the check error is It is NOT safe to stop the host then the host wont be able to put into maintenance mode.

Fixes: https://tracker.ceph.com/issues/49101
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0780fc131d1484601318eb0ec39f14955c731e16)

4 years agoMerge pull request #39913 from rhcs-dashboard/wip-49652-pacific
Ernesto Puerta [Wed, 10 Mar 2021 11:00:02 +0000 (12:00 +0100)]
Merge pull request #39913 from rhcs-dashboard/wip-49652-pacific

pacific: mgr/dashboard: fix PUT - /api/host/{hostname} while adding labels

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard:test prometheus rules through promtool 39983/head
Aashish Sharma [Wed, 3 Feb 2021 07:23:56 +0000 (12:53 +0530)]
mgr/dashboard:test prometheus rules through promtool

This PR intends to add unit testing for prometheus rules using promtool. To run the tests run 'run-promtool-unittests.sh' file.

Fixes: https://tracker.ceph.com/issues/45415
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 53a5816deda0874a3a37e131e9bc22d88bb2a588)

4 years agoMerge pull request #39963 from neha-ojha/wip-49670-pacific
Neha Ojha [Wed, 10 Mar 2021 01:24:14 +0000 (17:24 -0800)]
Merge pull request #39963 from neha-ojha/wip-49670-pacific

pacific: src/test/smoke.sh: increase timeout

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #39921 from neha-ojha/wip-revert-autoscaler-pacific
Yuri Weinstein [Tue, 9 Mar 2021 23:58:59 +0000 (15:58 -0800)]
Merge pull request #39921 from neha-ojha/wip-revert-autoscaler-pacific

pacific: Revert "mgr/pg_autoscaler: avoid scale-down until there is pressure"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
4 years agoMerge pull request #39844 from neha-ojha/wip-49565-pacific
Yuri Weinstein [Tue, 9 Mar 2021 23:57:38 +0000 (15:57 -0800)]
Merge pull request #39844 from neha-ojha/wip-49565-pacific

pacific: tests: ceph_test_rados_api_watch_notify: Allow for reconnect

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agocommon/mempool: Modify shard selection function 39977/head
Adam Kupczyk [Mon, 25 Jan 2021 10:45:06 +0000 (11:45 +0100)]
common/mempool: Modify shard selection function

Modify shard selection function, so no longer all threads use the same shard 0.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit fccbdc0905e3868666fbb10803bac6b73f687cb1)

4 years agocommon/mempool: Add test for mempool shards
Adam Kupczyk [Mon, 25 Jan 2021 10:33:28 +0000 (11:33 +0100)]
common/mempool: Add test for mempool shards

Add test that checks quality of mempool sharing.
It refuses to accept cases when variance is too large.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit e4e07de8f36d0d44b341d5784a8bf56192201b95)

4 years agosrc/test/smoke.sh: increase timeout 39963/head
Sage Weil [Thu, 4 Mar 2021 23:34:00 +0000 (17:34 -0600)]
src/test/smoke.sh: increase timeout

Fixes: https://tracker.ceph.com/issues/47419
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 69d7aa9bf1b0de490e70cedd0463d3ca765a5673)

4 years agoPendingReleaseNotes: document option osd_fast_shutdown_notify_mon 39957/head
Mauricio Faria de Oliveira [Tue, 26 Jan 2021 16:14:38 +0000 (13:14 -0300)]
PendingReleaseNotes: document option osd_fast_shutdown_notify_mon

Let's add the ``osd_fast_shutdown_notify_mon`` option to PendingReleaseNotes
so it is documented.

Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit 7f5aaef5d4585d74535192192c56549bd023bc1f)

4 years agoosd: add osd_fast_shutdown_notify_mon option (default false)
Mauricio Faria de Oliveira [Thu, 7 Jan 2021 22:44:44 +0000 (19:44 -0300)]
osd: add osd_fast_shutdown_notify_mon option (default false)

The osd_fast_shutdown option may cause the cluster log to receive
too many entries of 'osd.X reported immediately failed by osd.Y',
depending on cluster scale.

This might be an issue for LMA stacks/tools that check ceph logs
for failed lines, and then require additional logic to filter on
an intended OSD (fast) shutdown; might not be an option/possible,
and require an admin to analyze.

So, add osd_fast_shutdown_notify_mon option for OSD to also tell
the monitor it is shutting down (done in slow/non-fast shutdown)
under osd_fast_shutdown.

This introduces minimal delay (the ack from the mon is required
to prevent the messages), and addresses the cluster log issue.
Note: the osd_mon_shutdown_timeout option can be used to control
the maximum amount of time waiting for the monitor ack to arrive.

Fixes: http://tracker.ceph.com/issues/46978
Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com>
(cherry picked from commit c75734729764868c5c501722fc8de08dac9ebd4a)

4 years agoMerge pull request #39901 from tchaikov/pr-39461-pacific
Yuri Weinstein [Tue, 9 Mar 2021 17:35:48 +0000 (09:35 -0800)]
Merge pull request #39901 from tchaikov/pr-39461-pacific

pacific: rgw/test: allow for duplicate events in pubsub

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
4 years agotools/rados: assign to optional<> without deref'ing it 39952/head
Kefu Chai [Wed, 24 Feb 2021 14:24:50 +0000 (22:24 +0800)]
tools/rados: assign to optional<> without deref'ing it

this change addresses a regression introduced by
d333b35aa10bf03a8bc047994d5cf3fed019b49a

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 41d68594ae6df343782a1c382ac0bddc8cb7cb69)