]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agorgw: fix bucket purge incomplete multipart uploads 43862/head
J. Eric Ivancich [Mon, 8 Nov 2021 19:05:24 +0000 (14:05 -0500)]
rgw: fix bucket purge incomplete multipart uploads

The marker was not working correctly as segments of the bucket index
were listed to shut down any incomplete multipart uploads. This fixes
the marker, so it's maintained properly across iterations.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoMerge pull request #43787 from tchaikov/pacific-pr-41353
Yuri Weinstein [Mon, 8 Nov 2021 17:40:11 +0000 (09:40 -0800)]
Merge pull request #43787 from tchaikov/pacific-pr-41353

pacific: pybind/mgr/CMakeLists.txt: exclude files not used at runtime

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #43682 from rhcs-dashboard/wip-52806-pacific
Yuri Weinstein [Mon, 8 Nov 2021 17:39:22 +0000 (09:39 -0800)]
Merge pull request #43682 from rhcs-dashboard/wip-52806-pacific

pacific: mgr/dashboard: BATCH incl.: NFS integration, Cluster Expansion Workflow, and Angular 11 upgrade

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agoMerge pull request #43703 from cfsnyder/wip-52783-pacific
Yuri Weinstein [Mon, 8 Nov 2021 17:09:39 +0000 (09:09 -0800)]
Merge pull request #43703 from cfsnyder/wip-52783-pacific

pacific: rgw/sts: fix for copy object operation using sts

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43809 from cbodley/wip-qa-rgw-java-pacific
Yuri Weinstein [Mon, 8 Nov 2021 17:09:07 +0000 (09:09 -0800)]
Merge pull request #43809 from cbodley/wip-qa-rgw-java-pacific

pacific: qa/rgw: pacific branch targets ceph-pacific branch of java_s3tests

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
3 years agoMerge pull request #43777 from cfsnyder/wip-52468-pacific
Yuri Weinstein [Mon, 8 Nov 2021 17:06:32 +0000 (09:06 -0800)]
Merge pull request #43777 from cfsnyder/wip-52468-pacific

pacific: rgw: use existing s->bucket in s3 website retarget()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43708 from cfsnyder/wip-52598-pacific
Guillaume Abrioux [Mon, 8 Nov 2021 13:19:10 +0000 (14:19 +0100)]
Merge pull request #43708 from cfsnyder/wip-52598-pacific

pacific: ceph-volume: util/prepare fix osd_id_available()

3 years agoMerge pull request #43812 from rhcs-dashboard/wip-53153-pacific
Ernesto Puerta [Mon, 8 Nov 2021 13:18:36 +0000 (14:18 +0100)]
Merge pull request #43812 from rhcs-dashboard/wip-53153-pacific

pacific: mgr/dashboard: fix missing alert rule details

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agomgr/dashboard: fix missing alert rule details 43812/head
Ernesto Puerta [Wed, 3 Nov 2021 17:57:53 +0000 (18:57 +0100)]
mgr/dashboard: fix missing alert rule details

Fixes: https://tracker.ceph.com/issues/53144
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit b47f9c83d87057bbb1a0c6052450088532a31f81)

3 years agoMerge pull request #43793 from ifed01/wip-ifed-fix-omap-upgrade-pac
Yuri Weinstein [Thu, 4 Nov 2021 18:37:45 +0000 (11:37 -0700)]
Merge pull request #43793 from ifed01/wip-ifed-fix-omap-upgrade-pac

pacific: os/bluestore: fix invalid omap name conversion when upgrading to per-pg

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agomgr/dashboard: NFS 'create export' form: fixes 43682/head
Alfonso Martínez [Thu, 4 Nov 2021 13:56:37 +0000 (14:56 +0100)]
mgr/dashboard: NFS 'create export' form: fixes

* Do not allow a pseudo that is already in use by another export.
* Create mode form: prefill dropdown selectors if options > 0.
* Edit mode form: do not reset the field values that depend on other values that are being edited (unlike Create mode).
* Fix broken link: cluster service.
* Fix error message style for non-existent cephfs path.
* nfs-service.ts: lsDir: thow error if volume is not provided.
* File renaming: nfsganesha.py => nfs.py; test_ganesha.py => test_nfs.py

Fixes: https://tracker.ceph.com/issues/53083
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit d817a24e345516229bc637e2c675d12e6bfcc456)

 Conflicts:
src/pybind/mgr/dashboard/tests/test_ganesha.py
    - Delete file: in fact it's renamed as test_nfs.py

3 years agomgr/dashboard: python unit tests refactoring
Alfonso Martínez [Wed, 3 Nov 2021 09:17:21 +0000 (10:17 +0100)]
mgr/dashboard: python unit tests refactoring

* Controller tests: cherrypy config: authentication disabled by default; ability to pass custom config (e.g. enable authentication).
* Auth controller: add tests; test that unauthorized request fails when authentication is enabled.
* DocsTest: clear ENDPOINT_MAP so the test_gen_tags test becomes deterministic.
* pylint: disable=no-name-in-module: fix imports in tests.

Fixes: https://tracker.ceph.com/issues/53083
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit a6aeded5141ec3a959a86aa4002ccf5ac8d0a523)

 Conflicts:
src/pybind/mgr/dashboard/tests/test_docs.py
    - Resolved conflicts.
src/pybind/mgr/dashboard/tests/test_iscsi.py
    - Resolved conflicts.

3 years agoqa/rgw: pacific branch targets ceph-pacific branch of java_s3tests 43809/head
Casey Bodley [Thu, 4 Nov 2021 16:12:04 +0000 (12:12 -0400)]
qa/rgw: pacific branch targets ceph-pacific branch of java_s3tests

this commit is applied directly to the pacific branch instead of a
backport from master, because it targets the ceph-pacific branch instead
of the ceph-master branch on master

Signed-off-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43631 from rhcs-dashboard/wip-52803-pacific
Ernesto Puerta [Thu, 4 Nov 2021 09:22:07 +0000 (10:22 +0100)]
Merge pull request #43631 from rhcs-dashboard/wip-52803-pacific

pacific: mgr/dashboard,prometheus: fix handling of server_addr

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #43544 from trociny/wip-52936-pacific
Yuri Weinstein [Wed, 3 Nov 2021 22:35:55 +0000 (15:35 -0700)]
Merge pull request #43544 from trociny/wip-52936-pacific

pacific: osd: handle inconsistent hash info during backfill and deep scrub gracefully

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #43457 from gregsfortytwo/wip-52868-pacific
Yuri Weinstein [Wed, 3 Nov 2021 22:35:16 +0000 (15:35 -0700)]
Merge pull request #43457 from gregsfortytwo/wip-52868-pacific

pacific: mon: Allow specifying new tiebreaker monitors

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #43415 from trociny/wip-51909-pacific
Yuri Weinstein [Wed, 3 Nov 2021 22:34:29 +0000 (15:34 -0700)]
Merge pull request #43415 from trociny/wip-51909-pacific

pacific: crush: cancel upmaps with up set size != pool size

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #43740 from cfsnyder/wip-53091-pacific
Yuri Weinstein [Wed, 3 Nov 2021 19:08:46 +0000 (12:08 -0700)]
Merge pull request #43740 from cfsnyder/wip-53091-pacific

pacific: rgw: add abstraction for ops log destination and add file logger

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43695 from cfsnyder/wip-52960-pacific
Yuri Weinstein [Wed, 3 Nov 2021 19:08:11 +0000 (12:08 -0700)]
Merge pull request #43695 from cfsnyder/wip-52960-pacific

pacific: rgw/rgw_rados: make RGW request IDs non-deterministic

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #43662 from MrFreezeex/wip-53032-pacific
Yuri Weinstein [Wed, 3 Nov 2021 19:07:35 +0000 (12:07 -0700)]
Merge pull request #43662 from MrFreezeex/wip-53032-pacific

pacific: rbd-mirror: fix mirror image removal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #43694 from rhcs-dashboard/wip-53065-pacific
Ernesto Puerta [Wed, 3 Nov 2021 15:35:09 +0000 (16:35 +0100)]
Merge pull request #43694 from rhcs-dashboard/wip-53065-pacific

pacific: monitoring: ethernet bonding filter in Network Load.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoPendingReleaseNotes: document OMAP upgrade bug. 43793/head
Igor Fedotov [Tue, 2 Nov 2021 11:54:55 +0000 (14:54 +0300)]
PendingReleaseNotes: document OMAP upgrade bug.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit dfacf162afe55c6f15a8afb8aca18b52814e80ee)

3 years agoos/bluestore: fix invalid omap name conversion when upgrading to per-pg.
Igor Fedotov [Wed, 27 Oct 2021 10:59:34 +0000 (13:59 +0300)]
os/bluestore: fix invalid omap name conversion when upgrading to per-pg.

Fixes: https://tracker.ceph.com/issues/53062
Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit cbc97018d883333f81ab9a3cfa99d2f68a9874cd)

3 years agotest/store_test: add a UT for omap format upgrade.
Igor Fedotov [Wed, 27 Oct 2021 15:58:52 +0000 (18:58 +0300)]
test/store_test: add a UT for omap format upgrade.

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit ccb6fdf3b6ba700da1efea597deabe79329a4504)

3 years agoos/bluestore: permit legacy omap naming scheme in mkfs.
Igor Fedotov [Tue, 9 Feb 2021 15:37:41 +0000 (18:37 +0300)]
os/bluestore: permit legacy omap naming scheme in mkfs.

Primarily for debug purposes...

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 99e40a1e87c44705ffdb557d57bd54eaff31cfe3)

 Conflicts:
src/common/options/global.yaml.in
 old way of specifying config settings

3 years agorgw/rgw_rados: make RGW request IDs non-deterministic 43695/head
Cory Snyder [Tue, 5 Oct 2021 19:07:11 +0000 (19:07 +0000)]
rgw/rgw_rados: make RGW request IDs non-deterministic

Use a random number vs. incremental counter for first component of request ID.

Fixes: https://tracker.ceph.com/issues/52818
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit bce34dd68634d241b451111dcf2e931837eb4bfd)

3 years agorgw/sts: fix for copy object operation using sts 43703/head
Pritha Srivastava [Tue, 27 Oct 2020 17:12:52 +0000 (22:42 +0530)]
rgw/sts: fix for copy object operation using sts
temporary credentials

Fixes: https://tracker.ceph.com/issues/47809
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit c9614ba2d4395ef535151caba349662fc183e483)

3 years agoceph-volume: util/prepare fix osd_id_available() 43708/head
Guillaume Abrioux [Thu, 9 Sep 2021 08:23:43 +0000 (10:23 +0200)]
ceph-volume: util/prepare fix osd_id_available()

The current check only allows to request an OSD id that exists but
marked as 'destroyed'.
With this small fix, we can now use `--osd-id` with an id that doesn't
exist at all.

Fixes: https://tracker.ceph.com/issues/50880
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 73bfa5d2b0157f92721d8bf36619fd35ee265cdd)

3 years agomgr/dashboard: improve error handling for gather_facts
Avan Thakkar [Wed, 27 Oct 2021 19:30:28 +0000 (01:00 +0530)]
mgr/dashboard: improve error handling for gather_facts

Fixes: https://tracker.ceph.com/issues/53084
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 75c8d578ed106c4584c166d8ccd9153c69667d01)

3 years agomgr/dashboard: Cluster Creation Add multiple hosts at once
Aashish Sharma [Thu, 23 Sep 2021 10:52:56 +0000 (16:22 +0530)]
mgr/dashboard: Cluster Creation Add multiple hosts at once

Add multiple hosts at once in cluster creation wizard

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

3 years agomgr/dashboard: gather facts should only be fetched when orch backend is cephadm
Avan Thakkar [Wed, 20 Oct 2021 14:07:26 +0000 (19:37 +0530)]
mgr/dashboard: gather facts should only be fetched when orch backend is cephadm

Fixes: https://tracker.ceph.com/issues/52981
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Gather facts in UI should only be fetched if there is orch available and
get_facts feature is available for that orch backend.

(cherry picked from commit 78b8af2bda39dea8aa46a42e0cea4c5fd53c1d42)

3 years agomgr/dashboard: Fix for form inside form closing issue
Nizamudeen A [Sat, 23 Oct 2021 19:06:51 +0000 (00:36 +0530)]
mgr/dashboard: Fix for form inside form closing issue

After the angular 11 upgrade the form in form behaviour got broken when
one tries to close that "embedded" form. This commit is to fix that
behaviour.

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

3 years agomgr/dashboard: NFS exports: API + UI: integration with mgr/nfs; cleanups
Alfonso Martínez [Thu, 26 Aug 2021 10:05:54 +0000 (12:05 +0200)]
mgr/dashboard: NFS exports: API + UI: integration with mgr/nfs; cleanups

mgr/dashboard: move NFS_GANESHA_SUPPORTED_FSALS to mgr_module.py

Importing from nfs module throws AttributeError because as a side effect the dashboard module is impersonating the nfs module.
https://gist.github.com/varshar16/61ac26426bbe5f5f562ebb14bcd0f548

mgr/dashboard: 'Create NFS export' form: list clusters from nfs module

mgr/dashboard: frontend+backend cleanups for NFS export

Removed all code and references related to daemons. UI cleanup and adopted unit-testing for
nfs-epxort create form for CEPHFS backend. Cleanup for export list/get/create/set/delete endpoints.

mgr/dashboard: rm set-ganesha ref + update docs

Remove existing set-ganesha-clusters-rados-pool-namespace references as
they are no longer required. Moreover, nfs doc in dashboard doc is
updated accordingly to the current nfs status.

mgr/dashboard: add nfs-export e2e test coverage

mgr/dashboard: 'Create NFS export' form: remove RGW user id field.

- Improve bucket typeahead behavior.
- Increase version for bucket list endpoint.
- Some refactoring.

mgr/dashboard: 'Create NFS export' form: allow RGW backend only when default realm is selected.

When RGW multisite is configured, the NFS module can only handle buckets in the default realm.

mgr/dashboard: 'Create service' form: fix NFS service creation.

After https://github.com/ceph/ceph/pull/42073, NFS pool and namespace are not customizable.

mgr/dashboard: 'Create NFS export' form: add bucket validation.

- Allow only existing buckets.
- Refactoring:
  - Moved bucket validator from bucket form to cd-validators.ts
  - Split bucket validator into 2: bucket name validator and bucket existence (that checks either existence or non-existence).

mgr/dashboard: 'Create NFS export' form: path validation refactor: allow only existing paths.

Fixes: https://tracker.ceph.com/issues/46493
Fixes: https://tracker.ceph.com/issues/51479
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 58a6ab2147c34d5b3f14bf48f9b47b03bea8a672)

 Conflicts:
doc/mgr/dashboard.rst
  - Resolved conflicts.
src/pybind/mgr/dashboard/services/cephx.py
  - Deleted as in master.

3 years agomgr/dashboard: directly use ExportMgr and NFSCluster objects
Varsha Rao [Mon, 9 Aug 2021 19:00:16 +0000 (00:30 +0530)]
mgr/dashboard: directly use ExportMgr and NFSCluster objects

Using the objects directly provides access to other methods and helps in
avoiding repeatition.

mgr/dashboard/nfsganesha: remove tag

Since NFS v3 is no longer supported. We can remove tag.

mgr/nfs: define global constant to list supported FSALs

mgr/dashboard: directly list nfs clusters by directly importing available_cluster() method

The current dashboard api returns a list of following dictionary

{
   'pool': 'nfs-ganesha',
   'namespace': cluster_id,
   'type': 'orchestrator',
   'daemon_conf': None
}

None of these values are required for listing nfs cluster by mgr/nfs module.
Instead directly list available cluster names

mgr/dashboard: add comment to remove listing of daemons

As the configs are per cluster. There is no need to list daemons per cluster.

mgr/dashboard/controllers/nfsganesha: Add comments to update/remove status endpoint

This endpoint can be updated in suggested way or even removed. As it was
initially[1] introduced to check if dashboard pool and namespace configuration was
set.

[1] https://github.com/ceph/ceph/commit/824726393b185b8e5a8f17e66487dfde9f3c8b5c

mgr/nfs: remove fetch_cluster_obj()

There is no need to fetch NFSCluster class object. Directly
available_clusters() can be imported to list nfs clusters.

mgr/dashboard/controllers/nfsganesha: list exports based on cluster id

As mgr/nfs module lists based on cluster id.

mgr/dashboard/nfs: get and delete export by export id

Fixes: https://tracker.ceph.com/issues/46493
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 64178e1f5b0f26f5c17898e85c3d5b439e5f9dbf)

3 years agomgr/nfs: stick to lazy evaluation of logger messages
Ramana Raja [Thu, 30 Sep 2021 01:13:09 +0000 (21:13 -0400)]
mgr/nfs: stick to lazy evaluation of logger messages

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit e1c738cefe84c2b6dd15a6667d2df051a0f34e31)

3 years agoMerge pull request #43728 from sebastian-philipp/pacific-backport-42970-43021-43039...
Sebastian Wagner [Wed, 3 Nov 2021 11:37:45 +0000 (12:37 +0100)]
Merge pull request #43728 from sebastian-philipp/pacific-backport-42970-43021-43039-43010-42989-42859-43143-43141-43115-43162-

pacific: cephadm: October batch

Reviewed-by: Adam King <adking@redhat.com>
3 years agomgr/nfs: change _cmd_rgw_export_create_rgw() name
Varsha Rao [Mon, 16 Aug 2021 05:46:45 +0000 (11:16 +0530)]
mgr/nfs: change _cmd_rgw_export_create_rgw() name

To maintain uniformity in naming, modify _cmd_rgw_export_create_rgw() name to
_cmd_nfs_export_create_rgw().

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4137f88d0c4278ad1a8a7bce9c6d432d1c9e7c7c)

3 years agomgr/nfs: don't log fsal keys
Varsha Rao [Mon, 16 Aug 2021 05:39:18 +0000 (11:09 +0530)]
mgr/nfs: don't log fsal keys

FSAL keys are written to export objects. Don't log it, instead log the initial
export before generating keys and user config object mostly will not contain
export block. It's okay to log user config object content.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit b8c47c8d223f45092325cb8c02fa137eeebefb25)

3 years agomgr/nfs: Add more debug log messages
Varsha Rao [Mon, 16 Aug 2021 05:20:48 +0000 (10:50 +0530)]
mgr/nfs: Add more debug log messages

Fixes: https://tracker.ceph.com/issues/52274
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 719e7024682d64da9bb2c22b90725ff311e83860)

3 years agomgr/dashboard: consume mgr/nfs via mgr.remote()
Sage Weil [Wed, 28 Jul 2021 14:29:47 +0000 (10:29 -0400)]
mgr/dashboard: consume mgr/nfs via mgr.remote()

Stop using the dashboard version of the Ganesha config classes; consume
mgr/nfs instead via remote().

mgr/nfs/export: return Export from _apply_export

Future callers will want this.

mgr/nfs: new module methods for dashboard consumption

Add some new methods that are easy for the dashboard API to consume.  These
are very similar to the CLI methods but do now have the @CLICommand and
related decorators, and have slightly different interfaces (e.g., returning
the created/modified Export dict).

mgr/dashboard: remove old ganesha code (and tests)

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

Conflicts:
src/pybind/mgr/dashboard/services/ganesha.py
    - Deleted as in master.

3 years agomgr/dashboard: Cluster expansion review page minor bug fixes
Nizamudeen A [Tue, 26 Oct 2021 07:46:51 +0000 (13:16 +0530)]
mgr/dashboard: Cluster expansion review page minor bug fixes

Fix the Total Memory coming up as NaN Undefined
Remove `Add` Button in the Cluster Details table

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

3 years agomgr/dashboard: Proper error handling in module status guard
Nizamudeen A [Mon, 25 Oct 2021 07:25:35 +0000 (12:55 +0530)]
mgr/dashboard: Proper error handling in module status guard

I've recently introduced a check that verifies if the orch_backend we need for a feature matches the orch_backend of the cluster. But to verify this I need to call configOpt API and some user's don't have the permission to access it. So it'll show this Access Denied page.

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

3 years agomgr/dashboard: s/hosts.clickHostTab/hosts.clickTab/
Kefu Chai [Thu, 14 Oct 2021 22:44:55 +0000 (06:44 +0800)]
mgr/dashboard: s/hosts.clickHostTab/hosts.clickTab/

this change is a follow-up fix of
3276147049511a9a8d45d84c95154a4ec014cd83

otherwise we have following test failure:

[lint:tsc     ] cypress/integration/orchestrator/01-hosts.e2e-spec.ts(29,13): error TS2339: Property 'clickHostTab' does not exist on type 'HostsPageHelper'.

also change "host" to "hostname" to be more consistent

Fixes: https://tracker.ceph.com/issues/52645
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit a6bb0e9771eec7067ba03582583c78ded6eed8ee)

3 years agomgr/dashboard: Cluster expansion e2e cleanups
Nizamudeen A [Fri, 17 Sep 2021 13:13:01 +0000 (18:43 +0530)]
mgr/dashboard: Cluster expansion e2e cleanups

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

3 years agomgr/dashboard: introduce gather facts in host list
Avan Thakkar [Tue, 3 Aug 2021 09:01:57 +0000 (14:31 +0530)]
mgr/dashboard: introduce gather facts in host list

Fixes: https://tracker.ceph.com/issues/52017
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 6644a00a2c6d6a7fa709ee82f5ada0d73a0929a8)

3 years agomgr/dashboard: Cluster Creation Add Services Section
Aashish Sharma [Tue, 7 Sep 2021 06:30:45 +0000 (12:00 +0530)]
mgr/dashboard: Cluster Creation Add Services Section

Add Services section in cluster creation wizard
Create Cluster OSD Section Followups

1. The device preview disappearing when going to next step and coming back to the previous step
2. Even when clearing the device preview, the Storage Capacity count and the drive group spec doesn't get cleared.
3. Expanding the cluster without selecting any devices gives a 400
   error.
4. Renamed "Delete Host" to "Remove Host"
5. Generalizing most of the sub component code

Fixes: https://tracker.ceph.com/issues/52499
Fixes: https://tracker.ceph.com/issues/51991
Signed-off-by: Nizamudeen A <nia@redhat.com>
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b914f59ff123b9e006d7d11dc786e967c0271dbf)

3 years agomgr/dashboard: Cluster Creation Create OSDs Section
Nizamudeen A [Tue, 17 Aug 2021 13:34:31 +0000 (19:04 +0530)]
mgr/dashboard: Cluster Creation Create OSDs Section

Create OSDs section in cluster creation wizard

Fixes: https://tracker.ceph.com/issues/51991
Fixes: https://tracker.ceph.com/issues/52298
Signed-off-by: Nizamudeen A <nia@redhat.com>
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit ad1535eea465f5e9f096600e01df1e95813ebb18)

3 years agomgr/dashboard: Review Section for the Create Cluster Workflow
Avan Thakkar [Fri, 9 Jul 2021 13:27:35 +0000 (18:57 +0530)]
mgr/dashboard: Review Section for the Create Cluster Workflow

Fixes: https://tracker.ceph.com/issues/50566
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 2e31ba54273732db5d93a843d22345b676fcecf7)

3 years agomgr/dashboard: Cluster Creation Add Host Section and e2es
Nizamudeen A [Sun, 4 Jul 2021 13:16:45 +0000 (18:46 +0530)]
mgr/dashboard: Cluster Creation Add Host Section and e2es

Add host section of the cluster creation workflow.

1. Fix bug in the modal where going forward one step on the wizard and coming back opens up the add host modal.
2. Rename Create Cluster to Expand Cluster as per the discussions
3. A skip confirmation modal to warn the user when he tries to skip the
   cluster creation
4. Adapted all the tests
5. Did some UI improvements like fixing and aligning the styles,
   colors..
- Used routed modal for host Additon form
- Renamed the Create to Add in Host Form

Fixes: https://tracker.ceph.com/issues/51517
Fixes: https://tracker.ceph.com/issues/51640
Fixes: https://tracker.ceph.com/issues/50336
Fixes: https://tracker.ceph.com/issues/50565
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 59cbf97e6ceedee0f9d682a94a749fbb01e9f787)

3 years agomgr/dashboard: Create Cluster Workflow welcome screen and e2e tests
Avan Thakkar [Tue, 1 Jun 2021 12:55:15 +0000 (18:25 +0530)]
mgr/dashboard: Create Cluster Workflow welcome screen and e2e tests

A module option called CLUSTER_STATUS has two option. INSTALLED
AND POST_INSTALLED. When CLUSTER_STATUS is INSTALLED it will allow to show the
create-cluster-wizard after login the initial time.  After the cluster
creation is succesfull this option is set to POST_INSTALLED
Also has the e2e codes for the Review Section

Fixes: https://tracker.ceph.com/issues/50336
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit b9f38cadc46338c9f1527beeaaba3d42639badf9)

3 years agocephadm: expose gather-facts api method
Avan Thakkar [Fri, 11 Jun 2021 11:07:10 +0000 (16:37 +0530)]
cephadm: expose gather-facts api method

Fixes: https://tracker.ceph.com/issues/51209
This PR intends to expose host metadata(gather-facts) api method

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit f41eae16af9fa6725d5b714f068fab3f946d2927)

3 years agomgr/dashboard: Remove i18n Warning about duplicate id
Nizamudeen A [Thu, 30 Sep 2021 11:48:14 +0000 (17:18 +0530)]
mgr/dashboard: Remove i18n Warning about duplicate id

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

3 years agomgr/dashboard: Taking care of deprecation warnings and other errors
Nizamudeen A [Thu, 30 Sep 2021 07:47:15 +0000 (13:17 +0530)]
mgr/dashboard: Taking care of deprecation warnings and other errors

1. deprecation  group is deprecated: This API is not typesafe and can result in issues with Closure Compiler renaming. Use the `FormBuilder#group` overload with `AbstractControlOptions` instead.

2. cypress/integration/rgw/users.po.ts(113,23): error TS2345: Argument of type 'void' is not assignable to parameter of type 'string'.

3. Cannot find module 'isomorphic-form-data' from 'node_modules/swagger-ui/dist/swagger-ui.js'

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

3 years agomgr/dashboard: Angular v11 Migration
Nizamudeen A [Tue, 29 Jun 2021 09:30:34 +0000 (15:00 +0530)]
mgr/dashboard: Angular v11 Migration

Fixes: https://tracker.ceph.com/issues/50268
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit de2648501838891144a1cd85dc52527e1a28726f)
  Conflicts
src/pybind/mgr/dashboard/frontend/package.json
  - Resolved the conflicts
src/pybind/mgr/dashboard/frontend/package-lock.json
  - Generated a new package-lock.json file

3 years agopybind/mgr/CMakeLists.txt: exclude files not used at runtime 43787/head
Duncan Bellamy [Sat, 15 May 2021 10:05:48 +0000 (11:05 +0100)]
pybind/mgr/CMakeLists.txt: exclude files not used at runtime

Exclude node_modules so it is not installed with make install
Exclude cypress files and dashboard .(dot) files also

Fixes: https://tracker.ceph.com/issues/50827
Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
(cherry picked from commit 8797807f5355eb40f2a5d72eadb485bef94e8c23)

3 years agorgw: use existing s->bucket in s3 website retarget() 43777/head
Casey Bodley [Thu, 19 Aug 2021 19:01:08 +0000 (15:01 -0400)]
rgw: use existing s->bucket in s3 website retarget()

we should have already looked up s->bucket and s->object during auth

since s->object may store a raw pointer to s->bucket before this,
overwriting s->bucket here would leave a dangling pointer and Object's
operator<<() would crash

Fixes: https://tracker.ceph.com/issues/51491
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2598e062d04d7fe4477aa096c19ebebfa77d19ea)

3 years agoMerge pull request #43615 from batrick/i52999
Yuri Weinstein [Tue, 2 Nov 2021 13:34:49 +0000 (06:34 -0700)]
Merge pull request #43615 from batrick/i52999

pacific: mon/MDSMonitor: avoid crash when decoding old FSMap epochs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #43614 from batrick/i52998
Yuri Weinstein [Tue, 2 Nov 2021 13:33:41 +0000 (06:33 -0700)]
Merge pull request #43614 from batrick/i52998

pacific: mds/FSMap: do not assert allow_standby_replay on old FSMaps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agopybind/mgr/cephadm: upgrade MDS if no MDS is "up" 43728/head
Patrick Donnelly [Thu, 28 Oct 2021 00:26:55 +0000 (20:26 -0400)]
pybind/mgr/cephadm: upgrade MDS if no MDS is "up"

The upgrade process can get stuck if an MDS crashes. This should be rare
when straddling v16.2.5 where the compatset of the file system inherits
the FSMap "default". The MDS from pre-v16.2.5 do not yet share a
compatset with the mons so the mons will do no promotions, causing
upgrade task to get stuck.

Fixes: https://tracker.ceph.com/issues/53074
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d7717256644e45ba670165c6af0941461fb884f4)

3 years agomgr/orchestrator: log exception from wrapper
Sage Weil [Fri, 15 Oct 2021 15:44:59 +0000 (10:44 -0500)]
mgr/orchestrator: log exception from wrapper

This lets us see a proper traceback when we are calling across
modules.

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

3 years agomgr/orchestrator: add --zap flag to 'orch osd rm'
Cory Snyder [Fri, 10 Sep 2021 10:59:35 +0000 (06:59 -0400)]
mgr/orchestrator: add --zap flag to 'orch osd rm'

Adds the ability to zap OSD devices after removal, implemented as a flag
on the 'orch osd rm' command.

Fixes: https://tracker.ceph.com/issues/43692
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit ea507d6c86f6a6ed5850edf24116e12088b24036)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/rook/module.py

3 years agodoc/cephadm/operations: extend CEPHADM_STRAY_DAEMON
Sebastian Wagner [Tue, 28 Sep 2021 12:15:13 +0000 (14:15 +0200)]
doc/cephadm/operations: extend CEPHADM_STRAY_DAEMON

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit eff5c76d885c8ebb3199db362730a7b02796c367)

3 years agodoc/cephadm: osd.rst: s/Note, /.. note:: /
Sebastian Wagner [Tue, 26 Oct 2021 09:37:40 +0000 (11:37 +0200)]
doc/cephadm: osd.rst: s/Note, /.. note:: /

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit d749453ce4f9cd8f88bb70cb1421fb1963881248)

3 years agodoc/cephadm: osd.rst: s/DriveGroup/OSD spec/
Sebastian Wagner [Tue, 26 Oct 2021 09:31:14 +0000 (11:31 +0200)]
doc/cephadm: osd.rst: s/DriveGroup/OSD spec/

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 61fe2a21b7d3869a156b1994696b38fbb6587be9)

3 years agodoc/cephadm: osd.rst: Fix yaml comments
Sebastian Wagner [Tue, 26 Oct 2021 09:27:51 +0000 (11:27 +0200)]
doc/cephadm: osd.rst: Fix yaml comments

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 3b6ce664c3ed71aae9d5d4e182d42efe402a3161)

3 years agodoc/cephadm: Add "Deploying OSDs on multiple similar hosts"
Sebastian Wagner [Wed, 20 Oct 2021 12:38:40 +0000 (14:38 +0200)]
doc/cephadm: Add "Deploying OSDs on multiple similar hosts"

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 358a5ae588d0d98ba3a7f69d753aae2a639a6700)

3 years agodoc/cephadm: indent yaml specs
Sebastian Wagner [Wed, 20 Oct 2021 12:45:03 +0000 (14:45 +0200)]
doc/cephadm: indent yaml specs

properly conform with other service types

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 84dce06aa85c2a20ec81b7be38aeed8e83615415)

3 years agomgr/cephadm:improve validation of orch device zap
Paul Cuzner [Thu, 14 Oct 2021 00:06:30 +0000 (13:06 +1300)]
mgr/cephadm:improve validation of orch device zap

Improve the logic in the function to :
1. check that the host exists
2. check the host isn't in maintenance
3. check the disk exists on the host
4. check the disk isn't supporting a known OSD
5. check that the disk doesn't belong to another cluster

In addition the command now returns a completion message so
you know it worked.

Fixes: https://tracker.ceph.com/issues/52919
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit b7782084ac9657be9b2da6ebd56b5029cf859225)

3 years agocephadm: allow pulling from insecure registries
Joao Eduardo Luis [Mon, 11 Oct 2021 17:20:47 +0000 (17:20 +0000)]
cephadm: allow pulling from insecure registries

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit 0a86107dccfdffa7476c61312f0c3b5aae7da7b7)

3 years agomgr/cephadm: test: Move test_monitoring_ports to TestMonitoring
Sebastian Wagner [Mon, 18 Oct 2021 13:20:48 +0000 (15:20 +0200)]
mgr/cephadm: test: Move test_monitoring_ports to TestMonitoring

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit c1c1e961f677ea10f782cab412e8b845e100266b)

Conflicts:
    src/pybind/mgr/cephadm/tests/test_cephadm.py

3 years agomgr/cephadm: Monitoring: Verify config file generation
Sebastian Wagner [Mon, 18 Oct 2021 13:06:20 +0000 (15:06 +0200)]
mgr/cephadm: Monitoring: Verify config file generation

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit f4c154463365f7df5dcd9053e59de65f53bf0f5f)

Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py

3 years agomgr/cephadm: Monitoring: Prometheus: Fix IPv6
Sebastian Wagner [Mon, 18 Oct 2021 13:05:43 +0000 (15:05 +0200)]
mgr/cephadm: Monitoring: Prometheus: Fix IPv6

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 406734a14226800f2c2ed01290a508e89e0dec6e)

3 years agomgr/cephadm: Monitoring: Alertmanager: Fix IPv6
Sebastian Wagner [Mon, 18 Oct 2021 13:05:27 +0000 (15:05 +0200)]
mgr/cephadm: Monitoring: Alertmanager: Fix IPv6

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit d65ccf3a0f83fc4a79edfe46c9468cf77f655f83)

3 years agomgr/cephadm: Monitoring: Grafana: Fix IPv6
Sebastian Wagner [Mon, 18 Oct 2021 13:04:46 +0000 (15:04 +0200)]
mgr/cephadm: Monitoring: Grafana: Fix IPv6

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit bb2cb3ea3a9704cf124b5342fb2a974e8618cc01)

Conflicts:
src/pybind/mgr/cephadm/tests/test_ssh.py

3 years agodoc/cephadm: update typo in install.rst
Zac Dover [Wed, 20 Oct 2021 14:42:02 +0000 (00:42 +1000)]
doc/cephadm: update typo in install.rst

This PR changes the string

   use "--log-to-file" option during bootstrap

to

   use the "--log-to-file" option during bootstrap

The way that it was written makes it sound like it was
written by a native Russian speaker. But it was written
by me, a native English speaker, so this is on me.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit d5f6d8ef33413906c8a53a1196ad37a1e1e80289)

3 years agoFix option name osd_crush_chooseleaf_type
krafZLorG [Thu, 21 Oct 2021 07:27:14 +0000 (10:27 +0300)]
Fix option name osd_crush_chooseleaf_type

Signed-off-by: Dmitry Kvashnin <dm.kvashnin@gmail.com>
(cherry picked from commit 0e7c16ce2c94facb7b3979722d1ce50d28d4452f)

3 years agomgr/cephadm: update host when adding host that already exists
Daniel Pivonka [Thu, 12 Aug 2021 18:25:23 +0000 (14:25 -0400)]
mgr/cephadm: update host when adding host that already exists

update addr and labels of existing host
this prevents labels being removed if a host is readded
or addr being set to 127.0.... if readding host active mgr is on

Fixes: https://tracker.ceph.com/issues/51667
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 0facfac91fd8f71e5a8b869d818e7c2b07b93516)

3 years agomgr/cephadm: put list_servers output in debug logs
Adam King [Thu, 30 Sep 2021 12:34:58 +0000 (08:34 -0400)]
mgr/cephadm: put list_servers output in debug logs

Over time, seen a number of cases where daemons are being
marked stray for unknown reasons and it is always difficult
to debug due to the difficulty of finding what list_servers
is outputting. I think it would help to include this in the
debug logs. That way we have that side of the info available
and can easily compare it to daemon/host info cephadm is storing.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit bdc802354554ea9c5e7c0377e3fe695f719921a7)

3 years agocephadm: do not log commands sent to "call" function
Adam King [Thu, 14 Oct 2021 18:56:51 +0000 (14:56 -0400)]
cephadm: do not log commands sent to "call" function

They could potentially log sensitive info such as registry
login passwords

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 3205a835f6bfa1cea4415dc8a95888ac7dade181)

3 years agomgr/orchestrator: clean up 'orch device ls' output
Sage Weil [Tue, 3 Aug 2021 17:25:26 +0000 (13:25 -0400)]
mgr/orchestrator: clean up 'orch device ls' output

- headings in CAPS
- DEVICE ID, not just serial or model/vendor
- drop the health, LED fields from non-wide view
- sort devices
- 'Yes' or '', for easier visual parsing

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

3 years agoqa/suites/orch/cephadm/upgrade: smoke test for 'orch upgrade ls'
Sage Weil [Fri, 15 Oct 2021 15:58:41 +0000 (11:58 -0400)]
qa/suites/orch/cephadm/upgrade: smoke test for 'orch upgrade ls'

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

3 years agomgr/cephadm: make upgrade ls output structured
Sage Weil [Fri, 15 Oct 2021 15:09:07 +0000 (11:09 -0400)]
mgr/cephadm: make upgrade ls output structured

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

3 years agomgr/cephadm: add 'orch upgrade ls' to list available versions
Sage Weil [Tue, 12 Oct 2021 19:22:14 +0000 (15:22 -0400)]
mgr/cephadm: add 'orch upgrade ls' to list available versions

Optionally pass image name to query an alternative image/registry, or
--tags to list tags instead of ceph versions.

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

3 years agodoc/cephadm: Hosts: Add "initial CRUSH location"
Sebastian Wagner [Fri, 15 Oct 2021 11:13:02 +0000 (13:13 +0200)]
doc/cephadm: Hosts: Add "initial CRUSH location"

Followup on d2a9a35993

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 8e4f9ea46ceec267748d60c6ed009b209d2352ab)

3 years agodoc/cephadm: update example of custom container spec file
Sebastian Wagner [Wed, 29 Sep 2021 10:02:28 +0000 (12:02 +0200)]
doc/cephadm: update example of custom container spec file

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit ce73047d25599b247ab889614fa62684b0c7aca0)

3 years agodoc/cephadm: use sphinx autoclass to document IscsiServiceSpec
Sebastian Wagner [Wed, 29 Sep 2021 10:00:42 +0000 (12:00 +0200)]
doc/cephadm: use sphinx autoclass to document IscsiServiceSpec

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 2e7b369373236c32e429463512521da1fc7e159d)

3 years agodoc/cephadm: use sphinx autoclass to document RGWSpec
Sebastian Wagner [Tue, 28 Sep 2021 14:57:41 +0000 (16:57 +0200)]
doc/cephadm: use sphinx autoclass to document RGWSpec

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 8ef77a0bbcef710185c7ee6452d6ca8a133843c1)

3 years agomgr/cephadm: the display of 'orch osd rm status' is incorrect
jianglong01 [Tue, 7 Sep 2021 07:49:04 +0000 (15:49 +0800)]
mgr/cephadm: the display of 'orch osd rm status' is incorrect

After exec 'ceph orch osd rm --replace', 'orch osd rm status' has an wrong display.

wrong display:
OSD_ID  HOST                              STATE     PG_COUNT  REPLACE  FORCE  DRAIN_STARTED_AT
15      cephqa08.cpp.zzbm.qianxin-inc.cn  draining  0         True     True   2021-09-07 07:54:05.776906

correct display:
OSD_ID  HOST                              STATE     PG_COUNT  REPLACE  FORCE  DRAIN_STARTED_AT
15      cephqa08.cpp.zzbm.qianxin-inc.cn  draining  0         True     False  2021-09-07 07:35:34.731417

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit 465f7e8fa34b37cf09e4d280da5239086924b942)

3 years agocephadm: add a test on 'ceph orch ls'
Guillaume Abrioux [Wed, 29 Sep 2021 06:42:33 +0000 (08:42 +0200)]
cephadm: add a test on 'ceph orch ls'

This adds a unittest in order to cover the output of 'orch ls' command
and check the reporting about the running osd number is displayed as
expected.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Co-Authored-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 1d848dc447fd4df18893903a053d58129fb8c13a)

3 years agocephadm: fix osd size reported in 'orch ls'
Guillaume Abrioux [Wed, 22 Sep 2021 07:35:54 +0000 (09:35 +0200)]
cephadm: fix osd size reported in 'orch ls'

The current code enforces ('running osds' + 1), see [1].
Let's simply print the number of running osds instead of a
meaningless calculation.

[1] https://github.com/ceph/ceph/commit/1c0a0a6f6153dc555085f263f161666cd171964a#diff-4f2fb7d330e74b64ac41457b7c7a723cd78db86433e0b0c398874531e5a7e39eR1852-R1859

Fixes: https://tracker.ceph.com/issues/50928
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 97219591dab8f54f239ccfb1891c45b01e7bec79)

3 years agomgr/cephadm: use json-pretty for ceph-volume calls
Adam King [Wed, 29 Sep 2021 02:10:07 +0000 (22:10 -0400)]
mgr/cephadm: use json-pretty for ceph-volume calls

To avoid a single line json string that is too long
and causes a chunk longer than limit error

Fixes: https://tracker.ceph.com/issues/52745
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b20637714e366b44ec604a76bab9095d5f4a1ef2)

3 years agodoc/cephadm: document setting ssh-user during adopt
Daniel Pivonka [Mon, 11 Oct 2021 21:15:35 +0000 (17:15 -0400)]
doc/cephadm: document setting ssh-user during adopt

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

3 years agodoc/cephadm: note that replacment osd needs to be on same host as removed osd
Daniel Pivonka [Thu, 21 Oct 2021 17:05:05 +0000 (13:05 -0400)]
doc/cephadm: note that replacment osd needs to be on same host as removed osd

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

3 years agomgr/cephadm: set health check warning in `_apply_service_config` for invalid config...
Melissa Li [Thu, 5 Aug 2021 18:28:35 +0000 (14:28 -0400)]
mgr/cephadm: set health check warning in `_apply_service_config` for invalid config options and failures to set options

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit 0f8f085058dc3319c073fb50491d1862e45ba9a2)

3 years agomgr/cephadm: refactor `_check_for_strays` to use `remove_health_warning` helper
Melissa Li [Tue, 3 Aug 2021 17:50:26 +0000 (13:50 -0400)]
mgr/cephadm: refactor `_check_for_strays` to use `remove_health_warning` helper

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit f42992a1ef8f7827155e377013cef6c9a8cba15b)

3 years agomgr/cephadm: refactor `_refresh_hosts_and_daemons` to use `set_health_warning` and...
Melissa Li [Tue, 3 Aug 2021 17:46:21 +0000 (13:46 -0400)]
mgr/cephadm: refactor `_refresh_hosts_and_daemons` to use `set_health_warning` and `remove_health_warning` helpers

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit 2eacd6e7e936636b2eee82bd03ee59f67431cd2e)

3 years agomgr/cephadm: refactor `_update_paused_health` to use `set_health_warning` and `remove...
Melissa Li [Tue, 3 Aug 2021 17:40:39 +0000 (13:40 -0400)]
mgr/cephadm: refactor `_update_paused_health` to use `set_health_warning` and `remove_health_warning` helpers

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit cfd6ad0af2feac3a7611067dd7e88fed1b315023)

3 years agomgr/cephadm: refactor `_set_maintenance_health_check` to use `set_health_warning...
Melissa Li [Tue, 3 Aug 2021 17:34:06 +0000 (13:34 -0400)]
mgr/cephadm: refactor `_set_maintenance_health_check` to use `set_health_warning` helper

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit c3f8fba04a629f2f3e70d0f5443a42de54426bf2)

3 years agomgr/cephadm: add `set_health_warning` and `remove_health_warning` helpers in module.py
Melissa Li [Tue, 3 Aug 2021 17:28:40 +0000 (13:28 -0400)]
mgr/cephadm: add `set_health_warning` and `remove_health_warning` helpers in module.py

Fixes: https://tracker.ceph.com/issues/44414
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit 6044afb2cead4d54c19cb6052c90afd56c28e0d0)

3 years agocephadm: bootstrap --apply-spec shouldn't enforce :z
Guillaume Abrioux [Thu, 7 Oct 2021 14:23:07 +0000 (16:23 +0200)]
cephadm: bootstrap --apply-spec shouldn't enforce :z

There's no need to mount this file with the `:z` option.
read-only access is enough for this file.

Fixes: https://tracker.ceph.com/issues/52855
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit edc07019c6e70950d697ec0d7f3756065ac64b92)