From: Sage Weil Date: Tue, 16 Mar 2021 20:14:19 +0000 (-0500) Subject: Merge PR #40135 into pacific X-Git-Tag: v16.2.0~106 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a79b66e149c62c5a87bc5eae73ed15df7b9dc423;p=ceph.git Merge PR #40135 into pacific * refs/pull/40135/head: pybind/mgr: correct a MgrModule annotation mgr/ceph_module: add type annotation to BaseMgrModule mgr/prometheus: fix warning of possibly unbound variables mgr/prometheus: flake8 cleanups mgr/prometheus: fix import failure (flake8) mgr/prometheus: add type annotations mgr/prometheus: raise at seeing unknown status mgr/prometheus: implement command using CLIReadCommand mgr/{prometheus,telemetry}: appease mypy mgr/prometheus: add prometheus to flake8 test mgr/prometheus: escape special chars using r-string pybind/mgr/prometheus: PEP8 cleanups pybind/mgr/prometheus: add typing annotations mgr/prometheus: introduce metric for collection time mgr/cephadm: fix 'auth caps' fallback mgr/cephadm: ensure mgr metadata is not none qa/suites/rados/cephadm: add back centos+rhel with kubic podman qa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw qa/suites/rados/cephadm/upgrade: start at 15.2.9 to test iscsi upgrade qa/tasks/cephadm.py: don't set mgr count to +1 doc/cephadm: add note about deprecation of NFSv3 doc/cephadm: remove step to restart the mgr doc/cephadm: use `reconfig` instead of `redeploy` doc/cephadm: update custom j2 config-key name doc/cephadm: use 'apt' to install cephadm on Ubuntu mgr/cephadm: remove duplicate labels when adding a host mgr/cephadm: tolerate failure to update daemon caps mgr/cephadm: fix get_keyring_with_caps python-common: fix PlacementSpec target size method python-common: count-per-host must be combined with label or hosts or host_pattern mgr/cephadm: handle bare 'count-per-host:NNN', fix comments mgr/cephadm/schedule: remove Scheduler abstraction (for now at least) mgr/cephadm/schedule: calculate additions/removals in place() mgr/cephadm/schedule: allow colocation of certain daemon types mgr/cephadm/schedule: shuffle candidates, not final placements mgr/cephadm/schedule: pass per-type allow_colo to the scheduler mgr/cephadm/services/cephadmservice: fix typo mgr/cephadm/schedule: pass daemons, not get_daemons_func mgr/cephadm: use local var mgr/cephadm/schedule: move host filtering into get_candidates() python-common/ceph/deployment/service_spec: disallow max-per-host + explicit placement mgr/cephadm/schedule: respect count-per-host mgr/cephadm: adjust deployment logic to allow multiple daemons per host python-common: add count-per-host to PlacementSpec mgr/cephadm: do not worry about even # of monitors mgr/cephadm: add iscsi and nfs to upgrade mgr/cephadm: update caps if necessary when getting keyring mgr/cephadm: add cephfs-mirror to CEPH_UPGRADE_ORDER cephadm: Add cephfs-mirror qa/cephadm: Add cephfs-mirror test qa/tasks: some type annotations mgr/orch: Add cephfs-mirror to enum mgr/cephadm: Add CephfsMirrorService mgr/orch: replace def add_{type}(...) with generic add_daemon() mgr/cephadm: drop `create_func` arg from _add_daemon mgr/cephadm: move CephadmExporter to new module mgr/cephadm: fix CephadmExporter deployment cephadm: exporter: use os.path.realpath(__file__) mgr/cephadm: root mode: call (and deploy) cephadm binary cephadm: Get rid of injected_argv cephadm: Make path to cephadm binary unique python-common: continue to allow RGWSpec(realm=r,zone=z) PendingReleaseNodes: note changes in cephadm rgw behavior qa/tasks/cephadm: drop realm.zone convention for rgw doc: update docs doc/cephadm: rewrite "adoption process" doc/cephadm: rewrite "preparation" in adoption.rst doc/cephadm: add prompts to adoption.rst doc/cephadm: rewrite part of adoption.rst python-common/ceph/deployment: RGWSpec: accept (and drop) subcluster arg mgr/orchestrator: drop $realm.$zone naming convention mgr/cephadm: rgw: do not mess with realm configuration mgr/cephadm:Document the cephadm config-check feature mgr/cephadm:fix to resolve mypy issue mgr/cephadm:add unit test for the lookup_check helper mgr/cephadm:Drop active healthcheck during a disable request mgr/cephadm:Added helper function to return a specific healthcheck mgr/cephadm:unit test added for nics better than most mgr/cephadm:skip an alert if the linkspeed is better than most mgr/cephadm:fix mypy warning mgr/cephadm:Remove check from ceph metadata gathering mgr/cephadm:Add unit test for hosts without public network NIC mgr/cephadm:Minor updates to address review comments mgr/cephadm:Added CLI interface for the configuration checker mgr/cephadm:Multiple updates related to the addition of the CLI mgr/cephadm:Moved 'ownership' of the checker to cephadm mgr/cephadm:Unit tests updated to account for upgrades mgr/cephadm:Updates to CephadmConfigChecks class mgr/cephadm:Adds unit tests for the CephadmConfigChecks class mgr/cephadm:add module option to enable configuration checks mgr/cephadm:added ceph version consistency check mgr/cephadm: added config checker to main serve loop mgr/cephadm: adding check logic mgr/cephadm: resolve rebase conflicts mgr/cephadm:Document the intergration with libstoragemgmt mgr/cephadm:Enable cephadm device scan to use LSM mgr/cephadm: prevent traceback when invalid osd id passed to 'orch osd rm stop' mgr/cephadm: do not prime service cache on reconfig mgr/cephadm/osd: PEP-8 fix mgr/cephadm: Activate existing OSDs mgr/cephadm: osd: Use _run_cephadm_json() mgr/cephadm: document ok_to_stop output argument for clarity mgr/DaemonServer: make warning language a bit friendlier mgr/cephadm/upgrade: improve language a bit mgr/cephadm/upgrade: restart multiple osds at once mgr/cephadm: gather other osds that are safe to stop mgr/cephadm: optional pass 'known' through to ok_to_stop mgr/cephadm/upgrade: log start/stop/pause/resume mgr/cephadm: add CEPHADM_STRAY_DAEMON unittest mgr/cephadm: alias rgw-nfs -> nfs qa/tasks/cephadm: remove mirror code cephadm: fixup `alrady` -> `already` cephadm: Change outer quotes to avoid escaping inner quotes (Q003) cephadm: Remove bad quotes from multiline string (Q001) cephadm: Remove bad quotes (Q000) cephadm: introduce flake8-quotes cephadm: line break after binary operator (W504) cephadm: blank line contains whitespace (W293) cephadm: trailing whitespace (W291) cephadm: local variable 'e' is assigned to but never used (F841) cephadm: 'select' imported but unused (F401) cephadm: ambiguous variable name 'l' (E741) cephadm: do not use bare 'except' (E722) cephadm: statement ends with a semicolon (E703) cephadm: module level import not at top of file (E402) cephadm: expected 1 blank line before a nested definition (E306) cephadm: expected 2 blank lines after end of function or class (E305) cephadm: too many blank lines (E303) cephadm: expected 2 blank lines, found 1 (E302) cephadm: expected 1 blank line, found 0 (E301) cephadm: too many leading '#' for block comment (E266) cephadm: block comment should start with '# ' (E265) cephadm: at least two spaces before inline comment (E261) cephadm: unexpected spaces around keyword / parameter equals (E251) cephadm: multiple spaces after ',' (E241) cephadm: missing whitespace after ':' (E231) cephadm: missing whitespace around arithmetic operator (E226) cephadm: missing whitespace around operator (E225) cephadm: whitespace before ':' (E203) cephadm: whitespace after '{' (E201) cephadm: continuation line unaligned for hanging indent (E131) cephadm: continuation line under-indented for visual indent (E128) cephadm: continuation line over-indented for visual indent (E127) cephadm: continuation line over-indented for hanging indent (E126) cephadm: continuation line with same indent as next logical line (E125) cephadm: closing bracket does not match visual indentation (E124) cephadm: ... does not match indentation of opening bracket's line (E123) cephadm: continuation line missing indentation or outdented (E122) cephadm: continuation line under-indented for hanging indent (E121) cephadm: over-indented (E117) cephadm: introduce flake8 Reviewed-by: Juan Miguel Olmo --- a79b66e149c62c5a87bc5eae73ed15df7b9dc423