]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agocephfs-top: fix help text for delay 50715/head
Jos Collin [Thu, 20 Apr 2023 09:39:01 +0000 (15:09 +0530)]
cephfs-top: fix help text for delay

Updates:

`
  -d {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, --delay {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}
                        Refresh interval in seconds (default: 1)
`

to

`
  -d DELAY, --delay DELAY
                        Refresh interval in seconds (default: 1, range: 1 - 25)
`

Fixes: https://tracker.ceph.com/issues/59553
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 10a74b9f09b8e1402e421503d5ff23a44416bf15)

2 years agodoc: updating the doc with chamges related to delay option in cephfs-top
Neeraj Pratap Singh [Tue, 28 Mar 2023 10:36:49 +0000 (16:06 +0530)]
doc: updating the doc with chamges related to delay option in cephfs-top

Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 658133ac67a4eb5dedf349e575de8e125a25afb5)

 Conflicts:
    doc/cephfs/cephfs-top.rst
    - Resolved the cherry-pick conflict by dropping the HEAD section manually.

      This cherry-pick conflicted because it needs f7e86a92f2b770bf9b011d2f30defe222387d162.
      But we couldn't cherry-pick f7e86a92f2b770bf9b011d2f30defe222387d162 to pacific at the
      moment, as a future change b3459f7d7058a8c6cb5c1fcec31d99247fe4794e was already
      backported (bad backport) to pacific without considering f7e86a92f2b770bf9b011d2f30defe222387d162.

2 years agocephfs-top: fixing the -d [--delay] option in cephfs-top
Neeraj Pratap Singh [Tue, 28 Mar 2023 10:26:24 +0000 (15:56 +0530)]
cephfs-top: fixing the -d [--delay] option in cephfs-top

Fixes: https://tracker.ceph.com/issues/59188
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 07ffc8e1b460049718c5b1b428dc84ac56ad4864)

2 years agoqa: add tests for cephfs-top
Jos Collin [Wed, 1 Feb 2023 12:14:47 +0000 (17:44 +0530)]
qa: add tests for cephfs-top

* Updated the existing tests
* Added new qa tests for --dump and --dumpfs options
* Updated the cluster configuration to 2 mds, 2 clients

Fixes: https://tracker.ceph.com/issues/57014
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit ddd20d4d4ddb818ec8e032781335849f6301e475)

2 years agodoc: updates --dump and --dumpfs
Jos Collin [Wed, 30 Nov 2022 09:20:28 +0000 (14:50 +0530)]
doc: updates --dump and --dumpfs

Fixes: https://tracker.ceph.com/issues/57014
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 247f81e5b41fea9b1de2151e7318392c03e44c0b)

2 years agocephfs-top: dump values to stdout
Jos Collin [Mon, 21 Nov 2022 09:35:01 +0000 (15:05 +0530)]
cephfs-top: dump values to stdout

Fixes: https://tracker.ceph.com/issues/57014
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 6f08159a22b98cc7a26e3b86199e97ca90d590a4)

2 years agocephfs-top: drop x_coord_map
Jos Collin [Fri, 28 Oct 2022 05:21:08 +0000 (10:51 +0530)]
cephfs-top: drop x_coord_map

As we started using curses pads in PR#48090, we don't need x_coord_map anymore.
In this patch, the metrics are positioned in cephfs-top based on padding (ITEMS_PAD).

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 46dbd644e4f0b4ce920bbce7d9933a8a9e69526e)

 Conflicts:
    src/tools/cephfs/top/cephfs-top
    - resolved cherry-pick conflict due to the merge of 80a20916c76df1f501df1acaefb32321522a905c.
    - dropped x_coord_map manually in create_client() call.

2 years agodoc/man/cephfs-top.rst: add missing options: --delay, --conffile
wangxinyu [Wed, 23 Mar 2022 01:21:36 +0000 (09:21 +0800)]
doc/man/cephfs-top.rst: add missing options: --delay, --conffile

add missing options: --delay, --conffile

Signed-off-by: wangxinyu <wangxinyu@inspur.com>
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 58474bd82e86241545ccb6e34eccdff28946545c)

 Conflicts:
    src/tools/cephfs/top/cephfs-top
    - Fixed the conflict due to backport dc7917e4cf55b8a1e315b5b4dcae1ed6cf26b136
      and b3459f7d7058a8c6cb5c1fcec31d99247fe4794e. The commit 58474bd82e86241545ccb6e34eccdff28946545c
      should've been cherry-picked instead, which was already existing and add more commits on top of it.

      At this point, we need to cherry-pick doc/man/8/cephfs-top.rst changes in
      58474bd82e86241545ccb6e34eccdff28946545c and then the changes of src/tools/cephfs/top/cephfs-top
      conflicted.

2 years agoMerge pull request #51307 from zdover23/wip-doc-2023-05-02-backport-51299-to-pacific
Anthony D'Atri [Mon, 1 May 2023 23:26:03 +0000 (19:26 -0400)]
Merge pull request #51307 from zdover23/wip-doc-2023-05-02-backport-51299-to-pacific

pacific: doc/radosgw: rabbitmq - push-endpoint edit

2 years agoMerge pull request #51174 from trociny/wip-59237-pacific
Adam King [Mon, 1 May 2023 22:00:42 +0000 (18:00 -0400)]
Merge pull request #51174 from trociny/wip-59237-pacific

pacific: cephadm: mount host /etc/hosts for daemon containers in podman deployments

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agodoc/radosgw: rabbitmq - push-endpoint edit 51307/head
Zac Dover [Mon, 1 May 2023 17:14:01 +0000 (03:14 +1000)]
doc/radosgw: rabbitmq - push-endpoint edit

Remove a note that directed users to change "push-endpoint" (with a
hyphen) to "push_endpoint" (with an underscore) when using rabbitmq.

Re: https://github.com/ceph/ceph/pull/48486#issuecomment-1529925389

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e4b35de2abf00d514c76f77645c587c562bab05d)

2 years agoMerge pull request #51304 from zdover23/wip-doc-2023-05-02-backport-51296-to-pacific
Anthony D'Atri [Mon, 1 May 2023 20:36:54 +0000 (16:36 -0400)]
Merge pull request #51304 from zdover23/wip-doc-2023-05-02-backport-51296-to-pacific

pacific: doc/rados: edit stretch-mode.rst

2 years agodoc/rados: edit stretch-mode.rst 51304/head
Zac Dover [Mon, 1 May 2023 02:29:07 +0000 (12:29 +1000)]
doc/rados: edit stretch-mode.rst

Refine and supplement the introductory and explanatory text at the top
of the /doc/rados/operations/stretch-mode.rst file.

Co-authored-by: Josh Durgin <jdurgin@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit b642900abc57302e62a5064dba510c3cc5743ac0)

2 years agoMerge pull request #51291 from zdover23/wip-doc-2023-04-30-backport-51285-to-pacific
Anthony D'Atri [Sat, 29 Apr 2023 20:01:14 +0000 (16:01 -0400)]
Merge pull request #51291 from zdover23/wip-doc-2023-04-30-backport-51285-to-pacific

pacific: doc/rados: edit stretch-mode procedure

2 years agodoc/rados: edit stretch-mode procedure 51291/head
Zac Dover [Sat, 29 Apr 2023 00:14:02 +0000 (10:14 +1000)]
doc/rados: edit stretch-mode procedure

Edit the "stretch mode" section in doc/rados/operations/stretch-mode.rst
so that the procedure is formatted as a procedure and the sentences
correctly have heads.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit a19ff7a5ea9bbd24365648a90abfa1b720c5b231)

2 years agoMerge pull request #51274 from zdover23/wip-doc-2023-04-28-backport-51271-to-pacific
Anthony D'Atri [Fri, 28 Apr 2023 00:51:58 +0000 (20:51 -0400)]
Merge pull request #51274 from zdover23/wip-doc-2023-04-28-backport-51271-to-pacific

pacific: doc/rados: m-config-ref: edit "background"

2 years agodoc/rados: m-config-ref: edit "background" 51274/head
Zac Dover [Thu, 27 Apr 2023 22:35:17 +0000 (08:35 +1000)]
doc/rados: m-config-ref: edit "background"

Edit the "Background" section of doc/rados/monitor/config-ref.rst

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9223863fc83095def59b416bf70f9a828a701ccc)

2 years agoMerge pull request #51241 from zdover23/wip-doc-2023-04-27-backport-51154-to-pacific
zdover23 [Thu, 27 Apr 2023 00:44:42 +0000 (10:44 +1000)]
Merge pull request #51241 from zdover23/wip-doc-2023-04-27-backport-51154-to-pacific

pacific: doc/rados/ops: edit user-management.rst (3 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados/ops: edit user-management.rst (3 of x) 51241/head
Zac Dover [Thu, 20 Apr 2023 08:25:00 +0000 (10:25 +0200)]
doc/rados/ops: edit user-management.rst (3 of x)

Line-edit doc/rados/user-management.rst (3 of x).

https://tracker.ceph.com/issues/58485

Follows https://github.com/ceph/ceph/pull/51140.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 97b751ed8f8917f9d4d9cbca03f224e6518836ef)

2 years agoMerge pull request #51157 from zdover23/wip-doc-2023-04-20-backport-51140-to-pacific
zdover23 [Thu, 27 Apr 2023 00:09:27 +0000 (10:09 +1000)]
Merge pull request #51157 from zdover23/wip-doc-2023-04-20-backport-51140-to-pacific

pacific: doc/rados: edit user-management (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #51237 from zdover23/wip-doc-2023-04-27-backport-51204-to-pacific
Anthony D'Atri [Wed, 26 Apr 2023 22:27:10 +0000 (18:27 -0400)]
Merge pull request #51237 from zdover23/wip-doc-2023-04-27-backport-51204-to-pacific

pacific: doc/cephfs: explain cephfs data and metadata set

2 years agodoc/cephfs: explain cephfs data and metadata set 51237/head
Zac Dover [Tue, 25 Apr 2023 07:46:53 +0000 (17:46 +1000)]
doc/cephfs: explain cephfs data and metadata set

Explain how to set application metadata for the CephFS data pool and the
CephFS metadata pool.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9152f9700420f9735533f276559af87dff97bd75)

2 years agoMerge pull request #51222 from zdover23/wip-doc-2023-04-26-backport-51193-to-pacific
Anthony D'Atri [Wed, 26 Apr 2023 00:21:39 +0000 (20:21 -0400)]
Merge pull request #51222 from zdover23/wip-doc-2023-04-26-backport-51193-to-pacific

pacific: doc/start: rewrite intro paragraph

2 years agodoc/start: rewrite intro paragraph 51222/head
Zac Dover [Mon, 24 Apr 2023 11:02:16 +0000 (13:02 +0200)]
doc/start: rewrite intro paragraph

Rewrite the first paragraph in doc/start/intro.rst.

Signed-off-by: Zac Dover <zac.dover@proton.me>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit bea01d5f1469030253a3403dbb9e2c9fa97806ac)

2 years agoMerge pull request #50694 from kamoltat/wip-ksirivad-backport-pacific-50334
Yuri Weinstein [Mon, 24 Apr 2023 22:46:20 +0000 (15:46 -0700)]
Merge pull request #50694 from kamoltat/wip-ksirivad-backport-pacific-50334

pacific: pybind/mgr/pg_autoscaler: Reorderd if statement for the func: _maybe_adjust

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific
Anthony D'Atri [Sun, 23 Apr 2023 21:19:57 +0000 (23:19 +0200)]
Merge pull request #51183 from zdover23/wip-doc-2023-04-23-backport-51177-to-pacific

pacific: doc/start: edit first 150 lines of documenting-ceph

2 years agoMerge pull request #51186 from zdover23/wip-doc-2023-04-23-backport-51178-to-pacific
Anthony D'Atri [Sun, 23 Apr 2023 21:17:38 +0000 (23:17 +0200)]
Merge pull request #51186 from zdover23/wip-doc-2023-04-23-backport-51178-to-pacific

pacific: doc/glossary: add "Placement Groups" definition

2 years agodoc/glossary: add "Placement Groups" definition 51186/head
Zac Dover [Sat, 22 Apr 2023 08:55:38 +0000 (10:55 +0200)]
doc/glossary: add "Placement Groups" definition

Add a definition of "Placement Groups" to the Glossary.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9f37ea651f9ee2c51e0705b9b58ed356f1bc56e6)

2 years agodoc/start: edit first 50 lines of documenting-ceph 51183/head
Zac Dover [Sat, 22 Apr 2023 07:03:12 +0000 (09:03 +0200)]
doc/start: edit first 50 lines of documenting-ceph

Edit the first 150 lines of doc/start/documenting-ceph.rst. This is part
of an initiative to harvest the fruits of Cephalocon 2023, at which
documentation proved to be in demand to a surprising degree.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dd37f94aa4f1de947b1eaf5d82cc529925f5823e)

2 years agoqa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts 51174/head
Adam King [Mon, 30 Jan 2023 16:27:09 +0000 (11:27 -0500)]
qa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts

To make sure we aren't being affected by any podman introduced
changes to the /etc/hosts file and test that we're properly
mounting /etc/hosts in our daemon containers

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

Conflicts:
qa/suites/orch/cephadm/dashboard/0-distro/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/thrash-old-clients/0-size-min-size-overrides/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/.qa
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/centos_8.stream_container_tools.yaml
qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml
   (due to test_iscsi_pids_limit not backported)

2 years agocephadm: mount host /etc/hosts for containers in podman deployments
Adam King [Sat, 21 Jan 2023 23:44:22 +0000 (18:44 -0500)]
cephadm: mount host /etc/hosts for containers in podman deployments

Podman messes with the /etc/hosts file in certain version. There
was already a past issue with it placing the container name
there fixed by https://github.com/ceph/ceph/pull/42242. This time
it is adding an entry for "host.containers.internal" (seems to be
podman 4.1 onward currently). Iscsi figures out the FQDN for a
host by running

python3 -c 'import socket; print(socket.getfqdn())

which is resolving to "host.containers.internal" when run in
the container with the podman modified /etc/hosts.

There is also an issue with grafana dashboard with
this entry present

Passing --no-hosts resolves this, but I think in the past
we avoided that due to not wanting to break deployments
where host name resolution was handled using /etc/hosts.
That's why we had that workaround previously linked. This
time I'm not sure such a workaround exists. The try here
is to mount a copy of the host's version of /etc/hosts
into the iscsi container. That copy won't have the extra
entry podman adds in but will have any user created entries in
case they were actually using it for host name resolution.
If /etc/hosts file isn't present for whatever reason, we're
assuming that this user isn't using /etc/hosts for hostname
resolution, and just going back to passing --no-hosts.

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

2 years agodoc/rados: edit user-management (2 of x) 51157/head
Zac Dover [Tue, 18 Apr 2023 20:59:09 +0000 (22:59 +0200)]
doc/rados: edit user-management (2 of x)

Line-edit doc/rados/user-management.rst (2 of x). Some internal
references had to be removed, but these will be repaired when the next
part of this file is updated in a future PR.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e3575bb72f307a27d49fedf3692ca661e3d613a5)

2 years agoMerge pull request #50597 from neesingh-rh/wip-58986-pacific
Yuri Weinstein [Tue, 18 Apr 2023 15:04:04 +0000 (08:04 -0700)]
Merge pull request #50597 from neesingh-rh/wip-58986-pacific

pacific: cephfs-top: Handle `METRIC_TYPE_NONE` fields for sorting

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2 years agoMerge pull request #50305 from idryomov/wip-58647-pacific
Yuri Weinstein [Tue, 18 Apr 2023 15:01:37 +0000 (08:01 -0700)]
Merge pull request #50305 from idryomov/wip-58647-pacific

pacific: mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #51081 from rhcs-dashboard/wip-59453-pacific
Nizamudeen A [Mon, 17 Apr 2023 13:39:22 +0000 (19:09 +0530)]
Merge pull request #51081 from rhcs-dashboard/wip-59453-pacific

pacific: mgr/dashboard: fix cephadm e2e expression changed error

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
2 years agoMerge pull request #51118 from zdover23/wip-doc-2023-04-17-backport-51114-to-pacific
colemitchell [Mon, 17 Apr 2023 10:43:36 +0000 (12:43 +0200)]
Merge pull request #51118 from zdover23/wip-doc-2023-04-17-backport-51114-to-pacific

pacific: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/radosgw: format part of s3select 51118/head
Cole Mitchell [Mon, 17 Apr 2023 09:34:49 +0000 (05:34 -0400)]
doc/radosgw: format part of s3select

Partially format the 'Basic Workflow' section's introduction and 'Basic Functionalities' subsection in s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit 13cf134c0610509da52aa68e11e26f0740002bde)

2 years agoMerge pull request #51094 from zdover23/wip-doc-2023-04-16-backport-51091-to-pacific
zdover23 [Sun, 16 Apr 2023 16:26:30 +0000 (18:26 +0200)]
Merge pull request #51094 from zdover23/wip-doc-2023-04-16-backport-51091-to-pacific

pacific: doc/mgr/prometheus: fix confval reference

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51109 from zdover23/wip-doc-2023-04-16-backport-51099-to-pacific
zdover23 [Sun, 16 Apr 2023 16:24:49 +0000 (18:24 +0200)]
Merge pull request #51109 from zdover23/wip-doc-2023-04-16-backport-51099-to-pacific

pacific: doc/dev: format command in cephfs-mirroring

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51098 from zdover23/wip-doc-2023-04-16-backport-51062-to-pacific
zdover23 [Sun, 16 Apr 2023 16:22:54 +0000 (18:22 +0200)]
Merge pull request #51098 from zdover23/wip-doc-2023-04-16-backport-51062-to-pacific

pacific: doc/glossary: add "Hybrid Storage"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/mgr/prometheus: fix confval reference 51094/head
Piotr Parczewski [Sat, 15 Apr 2023 21:16:35 +0000 (23:16 +0200)]
doc/mgr/prometheus: fix confval reference

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit b9b75dafe248e07b21f2958023697397094cc537)

2 years agodoc/dev: format command in cephfs-mirroring 51109/head
Zac Dover [Sun, 16 Apr 2023 09:11:27 +0000 (11:11 +0200)]
doc/dev: format command in cephfs-mirroring

Correctly format a command in doc/dev/cephfs-mirroring/#creating-users.

Reported by casanlin@init7.net at
https://pad.ceph.com/p/Report_Documentation_Bugs

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 408219bfca6b1e698229967e76d22d10028b7c20)

2 years agoMerge pull request #51106 from zdover23/wip-doc-2023-04-16-backport-51103-to-pacific
colemitchell [Sun, 16 Apr 2023 14:43:19 +0000 (10:43 -0400)]
Merge pull request #51106 from zdover23/wip-doc-2023-04-16-backport-51103-to-pacific

pacific: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agodoc/radosgw: format part of s3select 51106/head
Cole Mitchell [Sun, 16 Apr 2023 13:13:56 +0000 (09:13 -0400)]
doc/radosgw: format part of s3select

Format the first section of s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit a6a84471a7af154e7ccc93f51df2fc9744dc606c)

2 years agodoc/glossary: add "Hybrid Storage" 51098/head
Zac Dover [Thu, 13 Apr 2023 12:01:44 +0000 (14:01 +0200)]
doc/glossary: add "Hybrid Storage"

Add "Hybrid Storage" to the glossary.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dc8148d0727b307fb3baa30baf9dfee9bf8a247e)

2 years agoMerge pull request #51089 from zdover23/wip-doc-2023-04-15-backport-51086-to-pacific
Anthony D'Atri [Sat, 15 Apr 2023 09:45:47 +0000 (11:45 +0200)]
Merge pull request #51089 from zdover23/wip-doc-2023-04-15-backport-51086-to-pacific

pacific: doc/rados/ops: remove ceph-medic from monitoring

2 years agodoc/rados/ops: remove ceph-medic from monitoring 51089/head
Zac Dover [Sat, 15 Apr 2023 07:42:31 +0000 (09:42 +0200)]
doc/rados/ops: remove ceph-medic from monitoring

Remove mention of ceph-medic from doc/rados/operations/monitoring.rst,
because it is no longer supported.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 42cd28a2a639e68a44838ae4e7f875cb6bd5d97b)

2 years agomgr/dashboard: fix cephadm e2e expression changed error 51081/head
Nizamudeen A [Fri, 14 Apr 2023 06:03:16 +0000 (11:33 +0530)]
mgr/dashboard: fix cephadm e2e expression changed error

tried to fix this issue from the daemon component sometime ago several
times but it didn't work. So force ignoring the error

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

2 years agoMerge pull request #51066 from ceph/pacific-release
Yuri Weinstein [Fri, 14 Apr 2023 16:24:08 +0000 (09:24 -0700)]
Merge pull request #51066 from ceph/pacific-release

v16.2.12

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2 years agoMerge pull request #50712 from lxbsz/wip-52440
Yuri Weinstein [Fri, 14 Apr 2023 15:41:53 +0000 (08:41 -0700)]
Merge pull request #50712 from lxbsz/wip-52440

pacific: qa: test the "ms_mode" options in kclient workflows

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2 years agoMerge pull request #51009 from rhcs-dashboard/wip-59419-pacific
Nizamudeen A [Fri, 14 Apr 2023 05:51:16 +0000 (11:21 +0530)]
Merge pull request #51009 from rhcs-dashboard/wip-59419-pacific

pacific: mgr/dashboard: fix eviction of all FS clients

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51073 from zdover23/wip-doc-2023-04-14-backport-50166-to-pacific
Anthony D'Atri [Fri, 14 Apr 2023 01:50:26 +0000 (21:50 -0400)]
Merge pull request #51073 from zdover23/wip-doc-2023-04-14-backport-50166-to-pacific

pacific: doc/rgw: refine "Setting a Zonegroup"

2 years agodoc/rgw: refine "Setting a Zonegroup" 51073/head
Zac Dover [Sun, 19 Feb 2023 13:50:43 +0000 (23:50 +1000)]
doc/rgw: refine "Setting a Zonegroup"

Streamline the "Setting a Zonegroup" section by separating out the
necessary prerequisite reading from the procedure itself.

I also corrected a typo in the word "following" in an unrelated section.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6e6010a31352ecce2c4c0fdd6ed11fba43165b6b)

2 years ago16.2.12 51066/head v16.2.12
Ceph Release Team [Thu, 13 Apr 2023 21:54:07 +0000 (21:54 +0000)]
16.2.12

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
2 years agoMerge pull request #51038 from rhcs-dashboard/wip-59403-pacific
Nizamudeen A [Thu, 13 Apr 2023 20:11:53 +0000 (01:41 +0530)]
Merge pull request #51038 from rhcs-dashboard/wip-59403-pacific

pacific: mgr/dashboard: fix create osd default selected as recommended not working

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years ago16.2.12
Ceph Release Team [Thu, 13 Apr 2023 14:09:26 +0000 (14:09 +0000)]
16.2.12

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>
2 years agoMerge pull request #51065 from zdover23/wip-doc-2023-04-13-backport-50713-to-pacific
Anthony D'Atri [Thu, 13 Apr 2023 12:35:09 +0000 (08:35 -0400)]
Merge pull request #51065 from zdover23/wip-doc-2023-04-13-backport-50713-to-pacific

pacific: doc/glossary: improve "CephX" entry

2 years agodoc/glossary: improve "CephX" entry 51065/head
Zac Dover [Tue, 28 Mar 2023 08:42:11 +0000 (18:42 +1000)]
doc/glossary: improve "CephX" entry

Improve the glossary entry for "CephX".

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 02e3a5cb763987eeaee2dd1a7543d2762aaad7fe)

2 years agoMerge pull request #51037 from zdover23/wip-doc-2023-04-12-backport-50993-to-pacific
zdover23 [Wed, 12 Apr 2023 09:42:25 +0000 (19:42 +1000)]
Merge pull request #51037 from zdover23/wip-doc-2023-04-12-backport-50993-to-pacific

pacific: doc/rados/operations: edit monitoring.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50996 from guits/cv-bkp-50473-pacific
Guillaume Abrioux [Wed, 12 Apr 2023 07:58:34 +0000 (09:58 +0200)]
Merge pull request #50996 from guits/cv-bkp-50473-pacific

ceph-volume: update the OS before deploying Ceph (pacific)

2 years agomgr/dashboard: fix create osds step failing on the default option 51038/head
Nizamudeen A [Thu, 6 Apr 2023 06:37:20 +0000 (12:07 +0530)]
mgr/dashboard: fix create osds step failing on the default option

the backend was reporting with a keyError which doesn't find the
`encrypted` key.

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

2 years agomgr/dashboard: add option to skip the create OSDs step
Nizamudeen A [Wed, 5 Apr 2023 06:37:11 +0000 (12:07 +0530)]
mgr/dashboard: add option to skip the create OSDs step

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

2 years agodoc/rados/operations: edit monitoring.rst 51037/head
Zac Dover [Tue, 11 Apr 2023 04:15:47 +0000 (14:15 +1000)]
doc/rados/operations: edit monitoring.rst

Line-edit the final third of doc/rados/operations/monitoring.rst.

Follows https://github.com/ceph/ceph/pull/50834.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit b9ccad80608953fc0af779e8cad93971d47649b6)

2 years agoMerge pull request #50872 from idryomov/wip-59208-pacific
Yuri Weinstein [Tue, 11 Apr 2023 20:05:42 +0000 (13:05 -0700)]
Merge pull request #50872 from idryomov/wip-59208-pacific

pacific: librbd: fix wrong attribute for rbd_quiesce_complete API

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50836 from pkalever/wip-59061-pacific
Yuri Weinstein [Tue, 11 Apr 2023 20:04:32 +0000 (13:04 -0700)]
Merge pull request #50836 from pkalever/wip-59061-pacific

pacific: librbd: report better errors when failing to enable mirroring on an image

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #50940 from cbodley/wip-qa-rgw-multifs-ubuntu-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:38:09 +0000 (12:38 -0700)]
Merge pull request #50940 from cbodley/wip-qa-rgw-multifs-ubuntu-pacific

pacific: qa/rgw: use symlinks to specify distro

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2 years agoMerge pull request #50886 from cfsnyder/wip-58511-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:36:49 +0000 (12:36 -0700)]
Merge pull request #50886 from cfsnyder/wip-58511-pacific

 pacific: rgw: optimizations for handling ECANCELED errors from within get_obj_state

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #49097 from cfsnyder/wip-57238-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:36:15 +0000 (12:36 -0700)]
Merge pull request #49097 from cfsnyder/wip-57238-pacific

pacific: rgw/coroutine: check for null stack on wakeup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #49091 from cfsnyder/wip-54155-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:35:49 +0000 (12:35 -0700)]
Merge pull request #49091 from cfsnyder/wip-54155-pacific

pacific: rgw: "reshard cancel" errors with "invalid argument"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #49089 from cfsnyder/wip-55505-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:35:21 +0000 (12:35 -0700)]
Merge pull request #49089 from cfsnyder/wip-55505-pacific

pacific: rgw: RGWPutLC does not require Content-MD5

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #49086 from cfsnyder/wip-57409-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:34:46 +0000 (12:34 -0700)]
Merge pull request #49086 from cfsnyder/wip-57409-pacific

pacific: rgw: bucket list operation slow down in special scenario

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #50624 from cbodley/wip-58275
Yuri Weinstein [Tue, 11 Apr 2023 19:29:38 +0000 (12:29 -0700)]
Merge pull request #50624 from cbodley/wip-58275

pacific: rgw: rgw_parse_url_bucket() rejects empty bucket names after 'tenant:'

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2 years agoMerge pull request #49327 from cfsnyder/wip-58211-pacific
Yuri Weinstein [Tue, 11 Apr 2023 19:28:35 +0000 (12:28 -0700)]
Merge pull request #49327 from cfsnyder/wip-58211-pacific

pacific: rgw: concurrency for multi object deletes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge branch 'cv-bkp-50473-pacific' of https://github.com/guits/ceph into pacific...
Yuri Weinstein [Tue, 11 Apr 2023 15:40:12 +0000 (15:40 +0000)]
Merge branch 'cv-bkp-50473-pacific' of https://github.com/guits/ceph into pacific-release

2 years agomgr/dashboard: fix eviction of all FS clients 51009/head
Pere Diaz Bou [Wed, 5 Apr 2023 16:54:45 +0000 (18:54 +0200)]
mgr/dashboard: fix eviction of all FS clients

Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
(cherry picked from commit 780f49325aefd0b2c537462c6bb498232621ee8a)

2 years agoceph-volume/tests: fix an issue with rpm 50996/head
Guillaume Abrioux [Tue, 11 Apr 2023 11:29:15 +0000 (13:29 +0200)]
ceph-volume/tests: fix an issue with rpm

Typical error seen in the CI:

```
error: /var/cache/dnf/baseos-00fe51d07def85f0/packages/kernel-core-4.18.0-483.el8.x86_64.rpm: signature hdr data: BAD, no. of bytes(459772) out of range
```

Upgrading `rpm` fixes this issue.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 05aa334b96ed8a8c8497047bc26da64ee3a3d1fa)

2 years agoMerge pull request #50917 from rhcs-dashboard/custom-image-kcli-pacific
Nizamudeen A [Tue, 11 Apr 2023 10:11:37 +0000 (15:41 +0530)]
Merge pull request #50917 from rhcs-dashboard/custom-image-kcli-pacific

pacific: mgr/dashboard: custom image for kcli bootstrap script

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agoceph-volume: add bluefs_buffered_io: false in functional tests
Guillaume Abrioux [Fri, 10 Mar 2023 15:44:16 +0000 (16:44 +0100)]
ceph-volume: add bluefs_buffered_io: false in functional tests

This is a workaround to make dmcrypt scenarios pass the CI.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 491e88ede56b51bc425ba5e38adf6eb74ad5196e)

2 years agoceph-volume: update the OS before deploying Ceph
Guillaume Abrioux [Fri, 10 Mar 2023 15:01:19 +0000 (16:01 +0100)]
ceph-volume: update the OS before deploying Ceph

ceph-volume tests are failing, OSDs never get up and running.
For some reason, updating the OS early in the testing workflow
addresses that issue in the CI.

-- to be continued ... --

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 663c914c59873f433a5512aca0ebc4b4a7ef1fd3)

2 years agoMerge pull request #50914 from rhcs-dashboard/wip-59347-pacific
Nizamudeen A [Tue, 11 Apr 2023 05:27:45 +0000 (10:57 +0530)]
Merge pull request #50914 from rhcs-dashboard/wip-59347-pacific

pacific: mgr/dashboard: ignore the rules 400 error in dashboard kcli e2e

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoMerge pull request #50121 from rhcs-dashboard/wip-57830-pacific
Nizamudeen A [Tue, 11 Apr 2023 05:25:49 +0000 (10:55 +0530)]
Merge pull request #50121 from rhcs-dashboard/wip-57830-pacific

pacific: mgr/dashboard: fix weird data in osd details

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoMerge pull request #50968 from zdover23/wip-doc-2023-04-10-backport-50828-to-pacific
colemitchell [Tue, 11 Apr 2023 01:03:07 +0000 (21:03 -0400)]
Merge pull request #50968 from zdover23/wip-doc-2023-04-10-backport-50828-to-pacific

pacific: doc/rados/ops: edit health checks.rst (5 of x)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #50878 from guits/wip-59311-pacific
Guillaume Abrioux [Mon, 10 Apr 2023 18:05:40 +0000 (20:05 +0200)]
Merge pull request #50878 from guits/wip-59311-pacific

pacific: ceph-volume: fix issue with fast device allocs when there are multiple PVs per VG

2 years agoMerge pull request #50971 from zdover23/wip-doc-2023-04-10-backport-50829-to-pacific
Anthony D'Atri [Mon, 10 Apr 2023 11:56:40 +0000 (07:56 -0400)]
Merge pull request #50971 from zdover23/wip-doc-2023-04-10-backport-50829-to-pacific

pacific: doc/rados/ops: edit health-checks.rst (6 of x)

2 years agodoc/rados/ops: edit health-checks.rst (6 of x) 50971/head
Zac Dover [Sat, 1 Apr 2023 20:39:32 +0000 (06:39 +1000)]
doc/rados/ops: edit health-checks.rst (6 of x)

Edit docs/rados/operations/health-checks.rst (6 of x).

Follows https://github.com/ceph/ceph/pull/50828.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit c59bc152ea746a8bfc5795dbeb68b2ef6e511b1f)

2 years agodoc/rados/ops: edit health checks.rst (5 of x) 50968/head
Zac Dover [Sat, 1 Apr 2023 20:33:45 +0000 (06:33 +1000)]
doc/rados/ops: edit health checks.rst (5 of x)

Edit docs/rados/operations/health-checks.rst (5 of x).

Follows https://github.com/ceph/ceph/pull/50827

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit cb8ec5b5ab8f5fb25c8f2c6404447dabe4ebd1ad)

2 years agoMerge pull request #50961 from zdover23/wip-doc-2023-04-09-backport-50958-to-pacific
Anthony D'Atri [Sun, 9 Apr 2023 19:07:19 +0000 (15:07 -0400)]
Merge pull request #50961 from zdover23/wip-doc-2023-04-09-backport-50958-to-pacific

pacific: doc/rados/ops: add hyphen to mon-osd-pg.rst

2 years agodoc/rados/ops: add hyphen to mon-osd-pg.rst 50961/head
Zac Dover [Sun, 9 Apr 2023 02:42:11 +0000 (12:42 +1000)]
doc/rados/ops: add hyphen to mon-osd-pg.rst

Remove confusing parentheses and add a clearer (as compared to the
parentheses) hyphen (actually an em-dash, or at least it is intended
to be an em-dash) to doc/rados/operations/monitoring-osd-pg.rst

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 0c965c18d0e6ab1461b5fad42d481f25e4207940)

2 years agoMerge pull request #50957 from zdover23/wip-doc-2023-04-09-backport-50827-to-pacific
zdover23 [Sun, 9 Apr 2023 05:05:16 +0000 (15:05 +1000)]
Merge pull request #50957 from zdover23/wip-doc-2023-04-09-backport-50827-to-pacific

pacific: doc/rados/ops: edit health-checks.rst (4 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50954 from zdover23/wip-doc-2023-04-09-backport-50826-to-pacific
zdover23 [Sun, 9 Apr 2023 05:03:59 +0000 (15:03 +1000)]
Merge pull request #50954 from zdover23/wip-doc-2023-04-09-backport-50826-to-pacific

pacific: doc/rados/ops: edit health-checks.rst (3 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #50951 from zdover23/wip-doc-2023-04-09-backport-50907-to-pacific
zdover23 [Sun, 9 Apr 2023 05:03:24 +0000 (15:03 +1000)]
Merge pull request #50951 from zdover23/wip-doc-2023-04-09-backport-50907-to-pacific

pacific: doc/rados/config: edit auth-config-ref

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados/ops: edit health-checks.rst (4 of x) 50957/head
Zac Dover [Sat, 1 Apr 2023 20:25:42 +0000 (06:25 +1000)]
doc/rados/ops: edit health-checks.rst (4 of x)

Edit docs/rados/operations/health-checks.rst (4 of x).

Follows https://github.com/ceph/ceph/pull/50826.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 31df75356f2e49e0da6e0f4a6ec498e3609bd39e)

2 years agodoc/rados/ops: edit health-checks.rst (3 of x) 50954/head
Zac Dover [Sat, 1 Apr 2023 20:17:06 +0000 (06:17 +1000)]
doc/rados/ops: edit health-checks.rst (3 of x)

Edit docs/rados/operations/health-checks.rst (3 of x).

Follows https://github.com/ceph/ceph/pull/50825

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e02ddb24e583b5bedd4056ba0871a9427b581bfe)

2 years agodoc/rados/config: edit auth-config-ref 50951/head
Zac Dover [Thu, 6 Apr 2023 00:21:01 +0000 (10:21 +1000)]
doc/rados/config: edit auth-config-ref

Line edit doc/rados/config/auth-config-ref.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3d0acf9372a35ef48be47efe68192ec389c17ccb)

2 years agoMerge pull request #50947 from zdover23/wip-doc-2023-04-08-backport-50863-to-pacific
zdover23 [Sat, 8 Apr 2023 04:54:09 +0000 (14:54 +1000)]
Merge pull request #50947 from zdover23/wip-doc-2023-04-08-backport-50863-to-pacific

pacific: doc/rados/ops: edit monitoring-osd-pg.rst (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #50944 from zdover23/wip-doc-2023-04-08-backport-50795-to-pacific
zdover23 [Sat, 8 Apr 2023 04:13:52 +0000 (14:13 +1000)]
Merge pull request #50944 from zdover23/wip-doc-2023-04-08-backport-50795-to-pacific

pacific: doc/rados: line-edit common.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados/ops: edit monitoring-osd-pg.rst (2 of x) 50947/head
Zac Dover [Wed, 5 Apr 2023 03:32:43 +0000 (13:32 +1000)]
doc/rados/ops: edit monitoring-osd-pg.rst (2 of x)

Line-edit monitoring-osd-pg.rst (2 of x).

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 270e2fd730dad19d970d73ea19c6872defa9fce4)

2 years agodoc/rados: line-edit common.rst 50944/head
Zac Dover [Thu, 30 Mar 2023 22:54:05 +0000 (08:54 +1000)]
doc/rados: line-edit common.rst

Edit syntax and semantics in doc/configuration/common.rst.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6c9f226742e951de6c40627271ba6d6cabba4535)

2 years agoMerge pull request #50850 from zdover23/wip-doc-2023-04-04-backport-50834-to-pacific
zdover23 [Sat, 8 Apr 2023 02:48:41 +0000 (12:48 +1000)]
Merge pull request #50850 from zdover23/wip-doc-2023-04-04-backport-50834-to-pacific

pacific: doc/rados: edit ops/monitoring.rst (2 of 3)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #50832 from zdover23/wip-doc-2023-04-02-backport-50818-to-pacific
zdover23 [Sat, 8 Apr 2023 02:48:10 +0000 (12:48 +1000)]
Merge pull request #50832 from zdover23/wip-doc-2023-04-02-backport-50818-to-pacific

pacific: doc/cephfs: Improve fs-volumes.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>