]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agorgw: adding a test to check if role metadata syncs fine. 48030/head
Pritha Srivastava [Tue, 22 Mar 2022 07:47:42 +0000 (13:17 +0530)]
rgw: adding a test to check if role metadata syncs fine.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 7140e822d6c32854d3beff005aa4287573abba7c)

3 years agorgw: code for correctly decoding permission policy and tags
Pritha Srivastava [Tue, 7 Dec 2021 03:38:04 +0000 (09:08 +0530)]
rgw: code for correctly decoding permission policy and tags
in a JSON object for a role.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 4bae137b110175e109ca13d0a432914be364f779)

3 years agorgw: implementation of forward_request_to_master()
Pritha Srivastava [Mon, 24 Jan 2022 05:31:08 +0000 (11:01 +0530)]
rgw: implementation of forward_request_to_master()
for role REST APIs.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit c129eda137c0f70422adf53f2383d3f5a604a3f4)

3 years agorgw: code changes to include tenant in replicated metadata
Pritha Srivastava [Tue, 25 Jan 2022 16:43:15 +0000 (22:13 +0530)]
rgw: code changes to include tenant in replicated metadata
for roles.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 0d96b29e8d5611a8a14aa20583f0feae5e5eba17)

3 years agorgw: adding roles to non master ops list.
Pritha Srivastava [Tue, 30 Nov 2021 08:18:01 +0000 (13:48 +0530)]
rgw: adding roles to non master ops list.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit a4caa0b10268d25ae00177a241acada86de3f1c5)

3 years agorgw: removing svc_role.h and svc_role.cc, and
Pritha Srivastava [Thu, 25 Nov 2021 10:54:23 +0000 (16:24 +0530)]
rgw: removing svc_role.h and svc_role.cc, and
references to RGWSI_Role and cleaning up code.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit e57e8da3224a5e56b499c59e6ded4b59bde60ee1)

3 years agorgw: oids must not be prefixed in case of read_info
Pritha Srivastava [Wed, 24 Nov 2021 08:10:17 +0000 (13:40 +0530)]
rgw: oids must not be prefixed in case of read_info
and store_info since that gets taken care of the meta_be->put()
and meta_be->get().

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit f272a57fdbafff9074dd9a4f07ec167692eb27d9)

3 years agorgw: adding a metadata section for roles.
Pritha Srivastava [Mon, 22 Nov 2021 06:57:03 +0000 (12:27 +0530)]
rgw: adding a metadata section for roles.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 9549d2cb6caef0041287d5d5d26d77c767169098)

3 years agorgw: moving data members of RGWRole into RGWRoleInfo.
Pritha Srivastava [Mon, 22 Nov 2021 06:54:50 +0000 (12:24 +0530)]
rgw: moving data members of RGWRole into RGWRoleInfo.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 520e4ffa3e2832f3d4ac0ec0652de62e33b5d868)

3 years agorgw: shifting back be_handler and module initialization to svc role
Pritha Srivastava [Fri, 19 Nov 2021 06:48:47 +0000 (12:18 +0530)]
rgw: shifting back be_handler and module initialization to svc role
rados.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit fb1f670fbb2c2c74b96b034185958139fdbec45f)

3 years agorgw: using put() method of metadata backend to ensure that role
Pritha Srivastava [Wed, 17 Nov 2021 15:19:56 +0000 (20:49 +0530)]
rgw: using put() method of metadata backend to ensure that role
metadata is written to md log in method store_info().

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 36169ca69fa874c7e79f698c1561226dec0c0f31)

3 years agorgw: cleanup.
Pritha Srivastava [Wed, 27 Oct 2021 09:12:46 +0000 (14:42 +0530)]
rgw: cleanup.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 510db31fc7173ee6b3836ebe80b14e4cf34140b0)

3 years agorgw: code for handling mtime, object tracker and attrs
Pritha Srivastava [Wed, 27 Oct 2021 05:42:12 +0000 (11:12 +0530)]
rgw: code for handling mtime, object tracker and attrs
needed for RGWRoleMetadataHandler.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit a1000262816e10fca38516028ba4e38099936adb)

3 years agorgw: removing do_start() method from
Pritha Srivastava [Tue, 26 Oct 2021 06:21:35 +0000 (11:51 +0530)]
rgw: removing do_start() method from
RGWRoleMetadataHandler and class RGWSI_Role_Module.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 3f574a39a4514d81ca6523faf4072e033f54c4ee)

3 years agorgw: role metadata handler invokes RGWRole interfaces.
Pritha Srivastava [Mon, 18 Oct 2021 05:53:17 +0000 (11:23 +0530)]
rgw: role metadata handler invokes RGWRole interfaces.
Removing references to RGW services and RGW Ctl.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 04913ebd8eb09ae2c69d278ec7ad012ea1d3e158)

3 years agosvc: role: use the stat system obj call for checking presence
Abhishek Lekshmanan [Mon, 2 Nov 2020 13:46:00 +0000 (14:46 +0100)]
svc: role: use the stat system obj call for checking presence

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 4aa53fffcf33e3b021ca5d2f456652c69b2d5e90)

3 years agorgw: tools: introduce `rgw_stat_system_obj`
Abhishek Lekshmanan [Mon, 2 Nov 2020 13:43:43 +0000 (14:43 +0100)]
rgw: tools: introduce `rgw_stat_system_obj`

Similar to the read and write system_obj interfaces this function stats an
object and returns the mtime & attrs if set.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 8f4e00c474a3a3bd607acbe5324c9f8b8e14b2fd)

3 years agorgw: role/svc cosmetic comments & ws cleanup
Abhishek Lekshmanan [Mon, 26 Oct 2020 17:36:25 +0000 (18:36 +0100)]
rgw: role/svc cosmetic comments & ws cleanup

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit d8c2a893b38dde969b2f976fdc453c516aa21b60)

3 years agorgw: role: use the list roles from role svc classes
Abhishek Lekshmanan [Mon, 26 Oct 2020 14:53:51 +0000 (15:53 +0100)]
rgw: role: use the list roles from role svc classes

This keeps the implementation of storage seperate from the RGWRole class. Also
drop the get_roles_by_path_prefix static function as this is currently
implemented in the backend and can be directly accessed from role ctl classes.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 846a0e4ec96d2e06fe96984d7be20d16bbb80c8f)

3 years agosvc: role: make string consts static
Abhishek Lekshmanan [Mon, 26 Oct 2020 14:52:54 +0000 (15:52 +0100)]
svc: role: make string consts static

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 35c0e1315cc29af1c99edaf6d0acdc41e0c24fae)

3 years agosvc: role: introduce list roles by path
Abhishek Lekshmanan [Mon, 26 Oct 2020 13:24:22 +0000 (14:24 +0100)]
svc: role: introduce list roles by path

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit e078dea84951568cce2551729cc221242ba244c1)

3 years agorgw: role: use svc->delete_role for deleting
Abhishek Lekshmanan [Wed, 21 Oct 2020 13:06:50 +0000 (15:06 +0200)]
rgw: role: use svc->delete_role for deleting

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a38db5d0fd21fcb0241e3de4998e9aca0252cf30)

3 years agorgw: role: use a err msg string in RoleInfo class for logging
Abhishek Lekshmanan [Wed, 21 Oct 2020 12:31:28 +0000 (14:31 +0200)]
rgw: role: use a err msg string in RoleInfo class for logging

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 46c20d9d7a19e2054f615f11b311b6afb23028ca)

3 years agorgw_role: remove unrelated functions
Abhishek Lekshmanan [Wed, 21 Oct 2020 11:46:00 +0000 (13:46 +0200)]
rgw_role: remove unrelated functions

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit ea187c9a69bb67f357420ab9dad76c94e2f0658a)

3 years agosvc: role: improve delete functions & introduce delete_role
Abhishek Lekshmanan [Wed, 21 Oct 2020 11:45:23 +0000 (13:45 +0200)]
svc: role: improve delete functions & introduce delete_role

This deletes all the role related objects

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0a74355a674f90eec154820fc6cc298e0f0cd291)

3 years agosvc: roles: set objv_tracker to null for sysobj calls
Abhishek Lekshmanan [Wed, 21 Oct 2020 10:45:44 +0000 (12:45 +0200)]
svc: roles: set objv_tracker to null for sysobj calls

Since these aren't tracked via MDLog and merely ancillary objects

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a92752be96d588df5d9062c1e977dd9dd2991da8)

3 years agorgw: role: move populate from svc->role
Abhishek Lekshmanan [Wed, 21 Oct 2020 10:45:09 +0000 (12:45 +0200)]
rgw: role: move populate from svc->role

As populate creates uuids etc which are only needed in direct calls to rgw_admin

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 5f9f977fd8ebce8028d7f07efd030cbbdb4ef2a1)

3 years agorgw: role: use create_role from svc
Abhishek Lekshmanan [Wed, 21 Oct 2020 08:32:42 +0000 (10:32 +0200)]
rgw: role: use create_role from svc

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 932807bc1c0a049a765e7ca97256e802416a7ba8)

3 years agosvc: role: introduce create role
Pritha Srivastava [Tue, 5 Oct 2021 09:18:05 +0000 (14:48 +0530)]
svc: role: introduce create role

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 6e462430f747416a0631fdaa5d60f7cd94ff4af2)

3 years agorgw: role: json fixes
Abhishek Lekshmanan [Tue, 20 Oct 2020 06:24:05 +0000 (08:24 +0200)]
rgw: role: json fixes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 93375dd04cfb265e0f76125732141d3e5423e05e)

3 years agorgw: role: use ot
Abhishek Lekshmanan [Tue, 20 Oct 2020 06:23:49 +0000 (08:23 +0200)]
rgw: role: use ot

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 7fb221cdef32692749f03f4dfe4ca65eaaf4b349)

3 years agosvc: role: move prefix to Module
Abhishek Lekshmanan [Tue, 20 Oct 2020 06:23:09 +0000 (08:23 +0200)]
svc: role: move prefix to Module

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 83e30f63b879163a52cca57b8f6c195c9e243569)

3 years agorgw: role fixes
Abhishek Lekshmanan [Thu, 15 Oct 2020 15:52:20 +0000 (17:52 +0200)]
rgw: role fixes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit feb4754e827d8368794fa0c3e9ecb3c1b0088191)

3 years agorgw: role: backend handler definition
Abhishek Lekshmanan [Thu, 15 Oct 2020 13:55:45 +0000 (15:55 +0200)]
rgw: role: backend handler definition

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit ceb7cf9fb07023fbab976ca26c4f1437e97a8d3a)

3 years agorgw: role: md handler get_meta_obj defn
Abhishek Lekshmanan [Thu, 15 Oct 2020 13:54:53 +0000 (15:54 +0200)]
rgw: role: md handler get_meta_obj defn

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 59b072ad7f66648fe6cfce5e175113cde60058b0)

3 years agorgw: role: define md handler for roles
Abhishek Lekshmanan [Tue, 6 Oct 2020 16:15:04 +0000 (18:15 +0200)]
rgw: role: define md handler for roles

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit d1fd01c46f2980af10ddb2941900e9013ad35279)

3 years agorgw: role: add RGWRoleMetadataObject
Abhishek Lekshmanan [Tue, 6 Oct 2020 14:11:36 +0000 (16:11 +0200)]
rgw: role: add RGWRoleMetadataObject

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 90b6642f2a1740deca826c799e4ccfbfcf3d9eac)

3 years agorgw: metadata: provide a constructor for RGWMetadataObject
Abhishek Lekshmanan [Tue, 6 Oct 2020 14:11:11 +0000 (16:11 +0200)]
rgw: metadata: provide a constructor for RGWMetadataObject

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0ca675644b0d181c697391f52cd5ea8a2c2581f1)

3 years agorgw: role: drop rados_ctl and use only role_ctl
Abhishek Lekshmanan [Wed, 14 Oct 2020 19:40:08 +0000 (21:40 +0200)]
rgw: role: drop rados_ctl and use only role_ctl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit e41629fc7f3fe200ea3cc46da63b595b32f1bbbf)

3 years agorgw: finish role class impl
Abhishek Lekshmanan [Wed, 14 Oct 2020 16:56:08 +0000 (18:56 +0200)]
rgw: finish role class impl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit ccebb5c63b7330d81e85008c42f52e5a9599acb8)

3 years agorgw: role: modify store_name & path
Abhishek Lekshmanan [Tue, 13 Oct 2020 12:42:42 +0000 (14:42 +0200)]
rgw: role: modify store_name & path

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit f8189c64da3cb6caa57db399bc9947fdbe7e130e)

3 years agorgw: base role md handler decl
Abhishek Lekshmanan [Thu, 1 Oct 2020 12:42:32 +0000 (14:42 +0200)]
rgw: base role md handler decl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit e2b8006bb6a8a1922093eff8a1e207d991eda0ff)

3 years agosvc: introduce role_rados service
Abhishek Lekshmanan [Thu, 1 Oct 2020 08:59:08 +0000 (10:59 +0200)]
svc: introduce role_rados service

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 3c7d027322c870a8d46c58010baf8d5d2c5eb8b5)

3 years agorgw: start using role_ctl
Abhishek Lekshmanan [Thu, 1 Oct 2020 08:58:54 +0000 (10:58 +0200)]
rgw: start using role_ctl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 7a2795f29320faf632d6c5b9ae3fde9d534eb477)

3 years agorgw: svc: role_rados: stub out get_path
Abhishek Lekshmanan [Thu, 1 Oct 2020 08:58:06 +0000 (10:58 +0200)]
rgw: svc: role_rados:  stub out get_path

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0569b7d05dc6fb05e97561fef2009ad689658189)

3 years agorgw_role: define RGWRoleCtl
Abhishek Lekshmanan [Wed, 30 Sep 2020 13:50:39 +0000 (15:50 +0200)]
rgw_role: define RGWRoleCtl

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 150f78b2d6cd8fae224af1bc0c75b2d581393148)

3 years agorgw: role: basic ctl class defn
Abhishek Lekshmanan [Mon, 28 Sep 2020 15:01:15 +0000 (17:01 +0200)]
rgw: role: basic ctl class defn

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 2335a4b2a181390317c957c33b5ae8c82d4cb891)

3 years agorgw: split RGWRole into an Info Class containing members
Abhishek Lekshmanan [Thu, 24 Sep 2020 10:58:22 +0000 (12:58 +0200)]
rgw: split RGWRole into an Info Class containing members

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 0cabcf6b8e810ecd3701129ad399b97a4d14b7e2)

3 years agorgw: implement delete oids
Abhishek Lekshmanan [Tue, 1 Sep 2020 15:19:10 +0000 (17:19 +0200)]
rgw: implement delete oids

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit cd69cfc5534685454228d3d4fcff962def20f266)

3 years agosvc: role: implement read/write role path & name
Abhishek Lekshmanan [Tue, 1 Sep 2020 15:10:50 +0000 (17:10 +0200)]
svc: role: implement read/write role path & name

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 00dbe323d153cd80125ef0f149599b04435f9b05)

3 years agosvc: role: implement get/put/delete Roles
Abhishek Lekshmanan [Mon, 31 Aug 2020 14:57:49 +0000 (16:57 +0200)]
svc: role: implement get/put/delete Roles

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 842f74a1cf43bdb3a86a3bf519e0016179b5ba06)

3 years agosvc: role: fix real_time put param
Abhishek Lekshmanan [Mon, 31 Aug 2020 14:57:25 +0000 (16:57 +0200)]
svc: role: fix real_time put param

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 4f8b4b5bc5d99474e364f7c677a8e54da8a33414)

3 years agorgw: RGWRole: add a missing RGWRados forward declaration
Abhishek Lekshmanan [Mon, 31 Aug 2020 14:56:55 +0000 (16:56 +0200)]
rgw: RGWRole: add a missing RGWRados forward declaration

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit cff18a2132f46bb25f978603ea166fc30c1481e3)

3 years agorgw: introduce RGW Role Rados service
Abhishek Lekshmanan [Mon, 31 Aug 2020 12:46:45 +0000 (14:46 +0200)]
rgw: introduce RGW Role Rados service

This handles the metadata for RGW Roles with the RADOS backend

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 3fe43071e2d641ff0bf39510716abc13fd13f5a6)

3 years agorgw: svc: introduce a service for rgw_role
Abhishek Lekshmanan [Wed, 26 Aug 2020 11:55:26 +0000 (13:55 +0200)]
rgw: svc: introduce a service for rgw_role

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 1584fe53b5708746b47c97e505b5a5888e3b355f)

3 years agoMerge pull request #47887 from rhcs-dashboard/wip-57356-quincy
Nizamudeen A [Thu, 1 Sep 2022 06:23:11 +0000 (11:53 +0530)]
Merge pull request #47887 from rhcs-dashboard/wip-57356-quincy

quincy: mgr/dashboard: ensure limit 0 returns 0 images

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47409 from rhcs-dashboard/wip-56567-quincy
Nizamudeen A [Thu, 1 Sep 2022 06:21:56 +0000 (11:51 +0530)]
Merge pull request #47409 from rhcs-dashboard/wip-56567-quincy

quincy: mgr/dashboard: rbd striping setting pre-population and pop-over

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: vrushch <NOT@FOUND>
3 years agomgr/dashboard: ensure limit 0 returns 0 images 47887/head
Pere Diaz Bou [Thu, 18 Aug 2022 11:34:15 +0000 (13:34 +0200)]
mgr/dashboard: ensure limit 0 returns 0 images

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit a80c058ad21127bee09b4a67886745d880799a10)

3 years agoMerge pull request #47747 from kotreshhr/wip-57112-quincy
Yuri Weinstein [Wed, 31 Aug 2022 14:28:49 +0000 (07:28 -0700)]
Merge pull request #47747 from kotreshhr/wip-57112-quincy

quincy: mgr/volumes: prevent intermittent ParsingError failure in "clone cancel"

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47734 from neesingh-rh/wip-57200-quincy
Yuri Weinstein [Wed, 31 Aug 2022 14:27:57 +0000 (07:27 -0700)]
Merge pull request #47734 from neesingh-rh/wip-57200-quincy

quincy: mgr/snap_schedule: replace .snap with the client configured snap dir name

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #47858 from adk3798/quincy-fix-tox-mgr
Adam King [Tue, 30 Aug 2022 13:04:15 +0000 (09:04 -0400)]
Merge pull request #47858 from adk3798/quincy-fix-tox-mgr

quincy: mgr/orchestrator/tests: don't match exact whitespace in table output

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47623 from aaSharma14/wip-57137-quincy
Nizamudeen A [Tue, 30 Aug 2022 11:05:05 +0000 (16:35 +0530)]
Merge pull request #47623 from aaSharma14/wip-57137-quincy

 quincy: mgr/dashboard: add flag to automatically deploy loki/promtail service at bootstrap

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47635 from rhcs-dashboard/wip-57142-quincy
Pere Diaz Bou [Tue, 30 Aug 2022 09:45:31 +0000 (11:45 +0200)]
Merge pull request #47635 from rhcs-dashboard/wip-57142-quincy

quincy: mgr/dashboard: fix _rbd_image_refs caching

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47724 from rhcs-dashboard/wip-57216-quincy
Nizamudeen A [Tue, 30 Aug 2022 06:46:05 +0000 (12:16 +0530)]
Merge pull request #47724 from rhcs-dashboard/wip-57216-quincy

quincy: mgr/dashboard: Hide maintenance option on expand cluster

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agomgr/orchestrator/tests: don't match exact whitespace in table output 47858/head
Adam King [Thu, 25 Aug 2022 16:09:49 +0000 (12:09 -0400)]
mgr/orchestrator/tests: don't match exact whitespace in table output

It seems that the exact spacing may differ a bit between
python versions. Currently seeing py3 (which cooresponds to py 3.6
on my system) passing these tests and py37 (which is python 3.7
obviously) failing. I think verifying against the exact whitespace
is unnecessary anyhow. As long as it isn't egregious, we don't
really need to worry about exactly what the spacing is.

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

3 years agoMerge pull request #46948 from lxbsz/wip-56055
Yuri Weinstein [Mon, 29 Aug 2022 15:13:35 +0000 (08:13 -0700)]
Merge pull request #46948 from lxbsz/wip-56055

quincy: ceph-fuse: add dedicated snap stag map for each directory

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #47683 from batrick/i57184
Yuri Weinstein [Mon, 29 Aug 2022 14:50:36 +0000 (07:50 -0700)]
Merge pull request #47683 from batrick/i57184

quincy: crash: pthread_mutex_lock()

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #46214 from rzarzynski/wip-common-dout-gcc12-ftbfs-quincy
Yuri Weinstein [Mon, 29 Aug 2022 14:48:25 +0000 (07:48 -0700)]
Merge pull request #46214 from rzarzynski/wip-common-dout-gcc12-ftbfs-quincy

quincy: common: fix FTBFS due to dout & need_dynamic on GCC-12

Reviewed-by: Kefu Chai <kchai@redhat.com>
3 years agoMerge pull request #47837 from zdover23/wip-doc-2022-08-28-backport-47736-to-quincy
zdover23 [Sun, 28 Aug 2022 21:38:00 +0000 (07:38 +1000)]
Merge pull request #47837 from zdover23/wip-doc-2022-08-28-backport-47736-to-quincy

quincy: doc: Update release process doc to accurately reflect current process

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc: Update release process doc to accurately reflect current process 47837/head
David Galloway [Mon, 22 Aug 2022 20:12:36 +0000 (16:12 -0400)]
doc: Update release process doc to accurately reflect current process

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit 4829af891ce9fbe41f4b48b10d342e774366dd52)

3 years agoMerge pull request #47688 from rzarzynski/wip-dup-trimming-test2-quincy
Laura Flores [Fri, 26 Aug 2022 23:05:05 +0000 (18:05 -0500)]
Merge pull request #47688 from rzarzynski/wip-dup-trimming-test2-quincy

quincy: osd, tools, kv: non-aggressive, on-line trimming of accumulated dups

3 years agoMerge pull request #47432 from lxbsz/wip-56461
Yuri Weinstein [Thu, 25 Aug 2022 20:31:55 +0000 (13:31 -0700)]
Merge pull request #47432 from lxbsz/wip-56461

quincy: mds: skip fetching the dirfrags if not a directory

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #47058 from lxbsz/wip-56464
Yuri Weinstein [Thu, 25 Aug 2022 20:29:46 +0000 (13:29 -0700)]
Merge pull request #47058 from lxbsz/wip-56464

quincy: mds: switch to use projected inode instead

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agoMerge pull request #47806 from adk3798/quincy-rgw-bad-example
Adam King [Thu, 25 Aug 2022 16:30:11 +0000 (12:30 -0400)]
Merge pull request #47806 from adk3798/quincy-rgw-bad-example

quincy: doc/cephadm: fix example for specifying networks for rgw

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #47181 from lxbsz/wip-55928
Yuri Weinstein [Thu, 25 Aug 2022 15:16:45 +0000 (08:16 -0700)]
Merge pull request #47181 from lxbsz/wip-55928

quincy: mds: fix crash when exporting unlinked dir

Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #47511 from nmshelke/wip-57057-quincy
Yuri Weinstein [Thu, 25 Aug 2022 15:14:05 +0000 (08:14 -0700)]
Merge pull request #47511 from nmshelke/wip-57057-quincy

quincy: mgr/volumes: filter internal directories in 'subvolumegroup ls' command

Reviewed-by: Kotresh HR <khiremat@redhat.com>
3 years agoMerge pull request #47584 from idryomov/wip-57107-quincy
Yuri Weinstein [Thu, 25 Aug 2022 15:12:56 +0000 (08:12 -0700)]
Merge pull request #47584 from idryomov/wip-57107-quincy

quincy: rbd: find_action() should sort actions first

Reviewed-by: Mykola Golub <mgolub@suse.com>
3 years agodoc/cephadm: fix example for specifying networks for rgw 47806/head
Adam King [Wed, 24 Aug 2022 14:36:53 +0000 (10:36 -0400)]
doc/cephadm: fix example for specifying networks for rgw

count_per_host must be used with underscores rather
than dashes to work, you need to pass service_id not
service_name and the option for the port is called
rgw_frontend_port not just "port"

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

3 years agoMerge pull request #47780 from zdover23/wip-doc-2022-08-24-backport-47751-to-quincy
zdover23 [Thu, 25 Aug 2022 12:48:34 +0000 (22:48 +1000)]
Merge pull request #47780 from zdover23/wip-doc-2022-08-24-backport-47751-to-quincy

quincy: doc/mgr: edit orchestrator.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #47789 from zdover23/wip-doc-2022-08-25-backport-47785-quincy
zdover23 [Thu, 25 Aug 2022 05:51:18 +0000 (15:51 +1000)]
Merge pull request #47789 from zdover23/wip-doc-2022-08-25-backport-47785-quincy

quincy: docs: fix doc link pointing to master in dashboard.rst

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodocs: fix doc link pointing to master in dashboard.rst 47789/head
Nizamudeen A [Wed, 24 Aug 2022 10:41:00 +0000 (16:11 +0530)]
docs: fix doc link pointing to master in dashboard.rst

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 79bbaa555307639cd10819c35c0d0c2f4cd7f0fd)

3 years agoMerge pull request #47739 from ceph/quincy-rtd3
Ilya Dryomov [Wed, 24 Aug 2022 09:03:00 +0000 (11:03 +0200)]
Merge pull request #47739 from ceph/quincy-rtd3

quincy: admin: Fix check if PR or release branch docs build

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agodoc/mgr: edit orchestrator.rst 47780/head
Zac Dover [Tue, 23 Aug 2022 06:59:04 +0000 (16:59 +1000)]
doc/mgr: edit orchestrator.rst

This PR improves the English language in the "Orchestrator CLI"
section of the MGR documentation. It adds a couple of section
headers in order to signpost the information in the document
a bit more than had already been done, but it makes no major
structural changes to the presentation of the information here.

This PR was motivated by feedback from the 2022 Ceph User Survey
in which one of the respondents wrote "better ceph orch documen-
tation".

The final section on this page, "Current Implementation Status",
must be verified by someone who is familiar with the current state
of "ceph orch" and a date stamp should be applied to the top of
the section so that the word "current" has a meaningful referent.

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

3 years agoMerge pull request #47703 from rhcs-dashboard/wip-55467-quincy
Nizamudeen A [Tue, 23 Aug 2022 07:04:05 +0000 (12:34 +0530)]
Merge pull request #47703 from rhcs-dashboard/wip-55467-quincy

quincy: mgr/dashboard: grafana frontend e2e testing and update cypress

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 years agofuse_ll: fix compile error when libfuse version is larger than 3.0 46948/head
Xiubo Li [Sat, 9 Jul 2022 00:48:40 +0000 (08:48 +0800)]
fuse_ll: fix compile error when libfuse version is larger than 3.0

Fixes: https://tracker.ceph.com/issues/56517
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 2f3f9d36afc891d55b1e4f13ca212c5aa040ee31)

3 years agoceph-fuse: add dedicated snap stag map for each directory
Xiubo Li [Wed, 6 Apr 2022 00:12:26 +0000 (08:12 +0800)]
ceph-fuse: add dedicated snap stag map for each directory

This will fix the fino colliding bug, which is caused when the
snapid is later than 0xffff.

From mds 'mds_max_snaps_per_dir' option, we can see that the max
snapshots for each directory is 4_K, and in ceph-fuse we have
around 64_K, which is from 0xffff - 2, stags could be used to make
the fake fuse inode numbers for each directory.

Fixes: https://tracker.ceph.com/issues/54653
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 7e4424a821f1f0162cc1f2bfddb1eb501e321702)

3 years agoceph-fuse: return EINVAL if get invalid fino instead of assert
Xiubo Li [Thu, 24 Mar 2022 02:01:57 +0000 (10:01 +0800)]
ceph-fuse: return EINVAL if get invalid fino instead of assert

All the snap ids of the finos returned to libfuse from libcephfs
will be recorded in the map of 'stag_snap_map', and will never be
erased before unmounting. So if libfuse passes invalid fino the
ceph-fuse should return EINVAL errno instead of crash itself.

Fixes: https://tracker.ceph.com/issues/54653
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a6e83d8dece53d11d0753f4843a6235eb1bb9834)

3 years agoceph-fuse: reserve stag number 1 for snapdirs
Xiubo Li [Wed, 23 Mar 2022 06:30:07 +0000 (14:30 +0800)]
ceph-fuse: reserve stag number 1 for snapdirs

There have two stags will be reserved, 0 for CEPH_NOSNAP and 1 for
CPEH_SNAPDIR.

This will always make sure that for the nonsnap and snapdir inode
numbers to be consistent for all the ceph-fuse mounts.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 2349083a9d3f503dbe48fb1bdc3a88c881ed11a9)

3 years agomds-client: make the fake inos option unchangeable in runtime
Xiubo Li [Wed, 23 Mar 2022 02:05:32 +0000 (10:05 +0800)]
mds-client: make the fake inos option unchangeable in runtime

If the flags is empty then in option.h in can_update_at_runtime()
it will return true. That means this opetion could be changed in
runtime, which is buggy. Because if this is false, ceph-fuse will
use its own fake inos instead of libcephfs'. If this is changed
during runtime, we will hit inos dosn't exist assert bugs.

Fixes: https://tracker.ceph.com/issues/54653
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 28d17ff81a93d5442d2107abbd51296ac822073a)

3 years agomgr/volumes: drop pre-python 3.2 version checks 47747/head
John Mulligan [Tue, 2 Aug 2022 13:45:59 +0000 (09:45 -0400)]
mgr/volumes: drop pre-python 3.2 version checks

Based on other conversations we believe that there is no need to support
python versions lower than Python 3.6 for pacific and later.  This means
it is safe to drop the remaining version checks for python
3.2.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 47162e4996a511d399809516a4890d72e6f84a44)

3 years agomgr/volumes: a lock to guard against races reading/writing config
John Mulligan [Mon, 11 Jul 2022 20:44:00 +0000 (16:44 -0400)]
mgr/volumes: a lock to guard against races reading/writing config

Fixes: https://tracker.ceph.com/issues/55583
Use a python threading lock to avoid race conditions where the
config file is being both read and written to at the same time.

Before this change, the content of the config file being parsed could be
'corrupted' by the MetadataManager racing with itself.  Along with the
previous two patches, additional logging was added to the mgr code to
produce the simplified version of the mgr log below:

```
[volumes INFO volumes.fs.operations.versions.metadata_manager] READ: b'[GLOBAL]\nversion = 2\ntype = clone\npath = /volumes/Park/babydino2/c9f773af-5221-49c6-846c-d65c0920ae3f\nstate = pending\n\n[source]\nvolume = cephfs\ngroup = Park\nsubvolume = Jurrasic\nsnapshot = dinodna0\n\n'
[volumes INFO volumes.fs.operations.versions.metadata_manager] READ: b''
[volumes INFO volumes.fs.operations.versions.metadata_manager] READ: b'[GLOBAL]\nversion = 2\ntype = clone\npath = /volumes/Park/babydino2/c9f773af-5221-49c6-846c-d65c0920ae3f\nstate = pending\n\n[source]\nvolume = cephfs\ngroup = Park\nsubvolume = Jurrasic\nsnapshot = dinodna0\n\n'
[volumes INFO volumes.fs.operations.versions.metadata_manager] wrote 203 bytes to config b'/volumes/Park/babydino2/.meta'
[volumes INFO volumes.fs.operations.versions.metadata_manager] READ: b'a0\n\n'
[volumes INFO volumes.fs.operations.versions.metadata_manager] READ: b''
[volumes ERROR volumes.module] Failed _cmd_fs_clone_cancel(clone_name:babydino2, format:json, group_name:Park, prefix:fs clone cancel, vol_name:cephfs) < "":
Traceback (most recent call last):
  ...
  File "/usr/lib64/python3.6/configparser.py", line 1111, in _read
    raise e
configparser.ParsingError: Source contains parsing errors: b'/volumes/Park/babydino2/.meta'
[line 13]: 'a0\n'
```

Looking at the above you can see that the log indicates a write to the
config file (of 203 bytes). This happens before the file has finished
reading and thus instead of getting an empty string indicating EOF, it
gets that last four bytes of the new content of the file. The lock
prevents the MetadataManager from both reading and writing the config
file at the same time.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 2fe83d72d94d1e0939d390554a833cd93b4dd965)

3 years agomgr/volumes: write volume metadata with shim class
John Mulligan [Tue, 12 Jul 2022 22:33:07 +0000 (18:33 -0400)]
mgr/volumes: write volume metadata with shim class

Add a class that works a bit like a python file object so that we
can simplify the flush function. Providing a file-like object to
the ConfigParser's write function avoids unnecessary copies to
a StringIO object and makes the code easier to read.

With no more uses of StringIO, the StringIO imports are removed.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d06d8a1f5255b5da9106cd70acc0de99f89d2b96)

3 years agomgr/volumes: read volume metadata file using read_string
John Mulligan [Tue, 12 Jul 2022 22:32:54 +0000 (18:32 -0400)]
mgr/volumes: read volume metadata file using read_string

The read_string method, available in Python 3.2 (we assume Python 3.6 as
our current minimum python versino), supports parsing a provided string
for ini-style configuration parameters. Refactoring the reading of the
config file from cephfs into a simple iterator function and then
providing it to the ConfigParser as a single string, allows us to avoid
using StringIO and  simplifies the refresh function.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit dc1b4aac90beb82fd994ad7fa8ccf3b72b9936ac)

3 years agoMerge pull request #47519 from kamoltat/wip-ksirivad-backport-quincy-46242
Yuri Weinstein [Mon, 22 Aug 2022 20:47:54 +0000 (13:47 -0700)]
Merge pull request #47519 from kamoltat/wip-ksirivad-backport-quincy-46242

quincy:pybind/mgr/pg_autoscaler: change overlapping roots to warning

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #47493 from petrutlucian94/wip-57054-quincy
Yuri Weinstein [Mon, 22 Aug 2022 20:47:02 +0000 (13:47 -0700)]
Merge pull request #47493 from petrutlucian94/wip-57054-quincy

quincy: common: use boost::shared_mutex on Windows

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #47171 from adk3798/quincy-loki-support
Yuri Weinstein [Mon, 22 Aug 2022 20:45:56 +0000 (13:45 -0700)]
Merge pull request #47171 from adk3798/quincy-loki-support

quincy: mgr/cephadm: fix the loki address in grafana, promtail configuration files

Reviewed-by: Teoman Onay <tonay@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #47110 from kotreshhr/wip-56526-quincy
Yuri Weinstein [Mon, 22 Aug 2022 20:42:14 +0000 (13:42 -0700)]
Merge pull request #47110 from kotreshhr/wip-56526-quincy

quincy: mds: Don't blocklist clients in any replay state

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
3 years agoadmin: Fix check if PR or release branch docs build 47739/head
David Galloway [Mon, 22 Aug 2022 20:29:01 +0000 (16:29 -0400)]
admin: Fix check if PR or release branch docs build

Uses built-in RTD vars.  https://docs.readthedocs.io/en/stable/environment-variables.html.

Follow up to https://github.com/ceph/ceph/pull/46917#discussion_r942359130.

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit f92133ca527b5608b7ba8b79396568b03fa686b3)

3 years agomgr/snap_schedule: add time zone suffix to snapshot dir name 47734/head
Milind Changire [Sat, 9 Apr 2022 03:03:22 +0000 (08:33 +0530)]
mgr/snap_schedule: add time zone suffix to snapshot dir name

Fixes: https://tracker.ceph.com/issues/54374
Signed-off-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 24c13e53dec46656ab92b6c30f5c20eb81a1c11f)

3 years agomgr/dashboard: update cypress to 9.7.0 47703/head
Nizamudeen A [Mon, 27 Jun 2022 11:58:14 +0000 (17:28 +0530)]
mgr/dashboard: update cypress to 9.7.0

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