]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agodoc/mgr: name data source in "Man Install & Config" 48371/head
Zac Dover [Wed, 12 Jan 2022 22:46:20 +0000 (08:46 +1000)]
doc/mgr: name data source in "Man Install & Config"

This PR specifies that the data source must be set to
be "Dashboard1" when you configure Grafana and Prometheus
manually.

This is a fixup of another PR which was created by Dr
Jake Grimmett. This is that PR:

Credit goes to Dr Jake Grimmett of Cambridge.

https://github.com/ceph/ceph/pull/44150/

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

3 years agoMerge pull request #48366 from zdover23/wip-doc-2022-10-05-backport-48362-to-pacific
zdover23 [Wed, 5 Oct 2022 07:26:11 +0000 (17:26 +1000)]
Merge pull request #48366 from zdover23/wip-doc-2022-10-05-backport-48362-to-pacific

pacific: doc/rados: refine English in crush-map-edits.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/rados: refine English in crush-map-edits.rst 48366/head
Zac Dover [Wed, 14 Sep 2022 05:19:44 +0000 (15:19 +1000)]
doc/rados: refine English in crush-map-edits.rst

This commit makes several refinements to the English in
rados/operations/crush-map-edits.rst, which refinements were suggested
by Cole Mitchell and Anthony D'Atri in the discussion of PR#48085.

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

3 years agoMerge pull request #48364 from zdover23/wip-doc-2022-10-05-backport-48085-to-pacific
zdover23 [Wed, 5 Oct 2022 01:47:39 +0000 (11:47 +1000)]
Merge pull request #48364 from zdover23/wip-doc-2022-10-05-backport-48085-to-pacific

pacific: doc/rados: update prompts in crush-map-edits.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
3 years agodoc/rados: update prompts in crush-map-edits.rst 48364/head
Zac Dover [Wed, 14 Sep 2022 05:19:44 +0000 (15:19 +1000)]
doc/rados: update prompts in crush-map-edits.rst

This PR updates the prompts in crush-map-edits.rst
to make them unselectable.

There remains no good known way to render parts of
a file if the first line of that file begins with a
hash (#). Sphinx italicizes such a first line, which
is not what I want. Two examples of this are present
in the file crush-maps-rst under the section called
"CRUSH Map Bucket Types". I set this down here for
my own records, in case it is helpful in finding a
way to make these sections render as I would prefer.

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

3 years agoMerge pull request #48048 from aaSharma14/wip-57498-pacific
Pere Diaz Bou [Tue, 4 Oct 2022 17:36:34 +0000 (19:36 +0200)]
Merge pull request #48048 from aaSharma14/wip-57498-pacific

pacific: mgr/dashboard: fix snapshot creation with duplicate name

3 years agoMerge pull request #48358 from zdover23/wip-doc-2022-10-04-backport-48346-to-pacific-3
zdover23 [Tue, 4 Oct 2022 14:27:54 +0000 (00:27 +1000)]
Merge pull request #48358 from zdover23/wip-doc-2022-10-04-backport-48346-to-pacific-3

pacific: doc/glossary.rst: remove duplicates

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/glossary.rst: remove duplicates 48358/head
Zac Dover [Mon, 3 Oct 2022 12:51:35 +0000 (22:51 +1000)]
doc/glossary.rst: remove duplicates

This commit removes similar but distinct entries for the following:
   * CephFS
   * Ceph Client

Removal of a glossary term that is referred to in the body of the
documentation suite requires the alteration of the text string
that refers to the glossary term. Alterations of this kind have
been made to doc/architecture.rst and doc/rados/api/index.rst.

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

3 years agoMerge pull request #48339 from zdover23/wip-doc-2022-10-02-backport-48333-to-pacific
zdover23 [Mon, 3 Oct 2022 03:58:12 +0000 (13:58 +1000)]
Merge pull request #48339 from zdover23/wip-doc-2022-10-02-backport-48333-to-pacific

pacific: doc/glossary.rst: alphabetize glossary terms

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/glossary.rst: alphabetize glossary terms 48339/head
Zac Dover [Sun, 2 Oct 2022 10:48:36 +0000 (20:48 +1000)]
doc/glossary.rst: alphabetize glossary terms

This commit (finally) alphabetizes the terms in the glossary.
This is not a grammar-correcting or usage-correcting commit.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #48335 from zdover23/wip-doc-2022-10-02-backport-48332-to-pacific
zdover23 [Sun, 2 Oct 2022 23:42:17 +0000 (09:42 +1000)]
Merge pull request #48335 from zdover23/wip-doc-2022-10-02-backport-48332-to-pacific

pacific: doc/rados: fix prompts in erasure-code.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
3 years agodoc/rados: fix prompts in erasure-code.rst 48335/head
Zac Dover [Sun, 2 Oct 2022 04:55:46 +0000 (14:55 +1000)]
doc/rados: fix prompts in erasure-code.rst

This commit adds unselectable prompts to doc/rados/
erasure-code.rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #48324 from zdover23/wip-doc-2022-10-01-backport-48322-to-pacific
zdover23 [Sat, 1 Oct 2022 07:01:40 +0000 (17:01 +1000)]
Merge pull request #48324 from zdover23/wip-doc-2022-10-01-backport-48322-to-pacific

pacific: doc/rados: rewrite EC intro

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
3 years agodoc/rados: rewrite EC intro 48324/head
Zac Dover [Thu, 1 Sep 2022 19:08:00 +0000 (05:08 +1000)]
doc/rados: rewrite EC intro

This PR rewrites the front matter in the "Erasure Code"
section of the RADOS documentation. Previously, the information
in this section was syntactically confused. I have also fleshed
out the distinction between erasure coding and replication.

Co-Author: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #48276 from torchiaf/wip-57681-pacific
Nizamudeen A [Fri, 30 Sep 2022 14:36:01 +0000 (20:06 +0530)]
Merge pull request #48276 from torchiaf/wip-57681-pacific

pacific: mgr/dashboard: Add text to empty life expectancy column

3 years agoMerge pull request #48106 from pdvian/wip-57313-pacific
Prashant [Thu, 29 Sep 2022 13:01:09 +0000 (23:01 +1000)]
Merge pull request #48106 from pdvian/wip-57313-pacific

pacific: osd, mds: fix the "heap" admin cmd printing always to error stream

3 years agomgr/dashboard: Add text to empty life expectancy column 48276/head
Francesco Torchia [Tue, 30 Aug 2022 14:46:03 +0000 (16:46 +0200)]
mgr/dashboard: Add text to empty life expectancy column

- Add life_expectancy_enabled field to /api/osd/{svc_id}/devices
- Add new value 'n/a' for 'Life Expectancy' column

Fixes: https://tracker.ceph.com/issues/43116
Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
(cherry picked from commit 811bba7e083919cf3b21ed01ac29a107b5bd006d)

3 years agoMerge pull request #48056 from adk3798/pacific-staggered-version-pacific
Adam King [Tue, 27 Sep 2022 17:18:16 +0000 (13:18 -0400)]
Merge pull request #48056 from adk3798/pacific-staggered-version-pacific

pacific: doc/cephadm: correct version staggered upgrade got in pacific

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #48069 from adk3798/pacific-docs-eca-mounts
Adam King [Tue, 27 Sep 2022 17:16:06 +0000 (13:16 -0400)]
Merge pull request #48069 from adk3798/pacific-docs-eca-mounts

pacific: doc/cephadm: document recommended syntax for mounting files with ECA

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #48109 from lxbsz/wip-57393
Yuri Weinstein [Tue, 27 Sep 2022 14:13:59 +0000 (07:13 -0700)]
Merge pull request #48109 from lxbsz/wip-57393

pacific: client: abort the client if we couldn't invalidate dentry caches

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47868 from MrFreezeex/pacific-ceph-mixin-backports
Arthur Outhenin-Chalandre [Tue, 27 Sep 2022 14:13:24 +0000 (16:13 +0200)]
Merge pull request #47868 from MrFreezeex/pacific-ceph-mixin-backports

Pacific ceph mixin backports

3 years agoMerge pull request #48108 from lxbsz/wip-57395
Yuri Weinstein [Tue, 27 Sep 2022 14:12:59 +0000 (07:12 -0700)]
Merge pull request #48108 from lxbsz/wip-57395

pacific: client: stop the remount_finisher thread in the Client::unmount()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47998 from neesingh-rh/wip-57282-pacific
Yuri Weinstein [Tue, 27 Sep 2022 14:12:24 +0000 (07:12 -0700)]
Merge pull request #47998 from neesingh-rh/wip-57282-pacific

pacific: cephfs-top: adding filesystem menu option

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #48020 from rzarzynski/wip-doc-dups-trimming-relnotes-pacific
Radoslaw Zarzynski [Mon, 26 Sep 2022 10:22:50 +0000 (12:22 +0200)]
Merge pull request #48020 from rzarzynski/wip-doc-dups-trimming-relnotes-pacific

pacific: PendingReleaseNotes: document online and offline trimming of PG Log's…

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #48236 from zdover23/wip-doc-2022-09-12-backport-48235-to-pacific
zdover23 [Sun, 25 Sep 2022 20:38:48 +0000 (06:38 +1000)]
Merge pull request #48236 from zdover23/wip-doc-2022-09-12-backport-48235-to-pacific

pacific: doc/dev: improve presentation of note (git remote)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/dev: improve presentation of note (git remote) 48236/head
Zac Dover [Sun, 25 Sep 2022 03:41:35 +0000 (13:41 +1000)]
doc/dev: improve presentation of note (git remote)

This commit corrects the formatting of a note that previously
did not make console output and commands as clear as this commit
makes them.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #48176 from torchiaf/wip-57584-pacific
Nizamudeen A [Fri, 23 Sep 2022 05:30:19 +0000 (11:00 +0530)]
Merge pull request #48176 from torchiaf/wip-57584-pacific

pacific: mgr/dashboard: Add details to the modal which displays the `safe-to-d…

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoPendingReleaseNotes: document online and offline trimming of PG Log's dups 48020/head
Radoslaw Zarzynski [Tue, 23 Aug 2022 19:50:48 +0000 (19:50 +0000)]
PendingReleaseNotes: document online and offline trimming of PG Log's dups

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit dbfb50453c2f7fe5b0a06d846dd38693cceb63fe)

Conflicts:
    PendingReleaseNotes
- Moved the note under the new ">=16.2.11" section

3 years agoMerge pull request #47764 from rzarzynski/wip-get_or_fail-debug-louder-pacific
Yuri Weinstein [Thu, 22 Sep 2022 20:30:14 +0000 (13:30 -0700)]
Merge pull request #47764 from rzarzynski/wip-get_or_fail-debug-louder-pacific

pacific: msg: Log at higher level when Throttle::get_or_fail() fails

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
3 years agoMerge pull request #48189 from rhcs-dashboard/wip-57224-pacific
Pedro Gonzalez Gomez [Thu, 22 Sep 2022 12:00:03 +0000 (14:00 +0200)]
Merge pull request #48189 from rhcs-dashboard/wip-57224-pacific

pacific: mgr/dashboard: fix rgw connect when using ssl

Reviewed-by: Pegonzal <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47701 from rzarzynski/wip-dup-trimming-test2-pacific
Yuri Weinstein [Wed, 21 Sep 2022 22:35:31 +0000 (15:35 -0700)]
Merge pull request #47701 from rzarzynski/wip-dup-trimming-test2-pacific

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

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #47303 from petrutlucian94/wip-56729-pacific
Yuri Weinstein [Wed, 21 Sep 2022 22:34:39 +0000 (15:34 -0700)]
Merge pull request #47303 from petrutlucian94/wip-56729-pacific

pacific: msg: Fix Windows IPv6 support

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
3 years agoMerge pull request #47939 from idryomov/wip-56703-pacific
Yuri Weinstein [Wed, 21 Sep 2022 15:35:57 +0000 (08:35 -0700)]
Merge pull request #47939 from idryomov/wip-56703-pacific

pacific: librbd/cache/pwl: narrow the scope of m_lock in write_image_cache_state()

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agoMerge pull request #47990 from guits/wip-57381-pacific
Guillaume Abrioux [Wed, 21 Sep 2022 04:37:41 +0000 (06:37 +0200)]
Merge pull request #47990 from guits/wip-57381-pacific

pacific: ceph-volume: add a retry in util.disk.remove_partition

3 years agoMerge pull request #48158 from zdover23/wip-doc-2022-09-18-backport-48157-to-pacific
zdover23 [Tue, 20 Sep 2022 20:55:14 +0000 (06:55 +1000)]
Merge pull request #48158 from zdover23/wip-doc-2022-09-18-backport-48157-to-pacific

pacific: doc/rados: update prompts in network-config-ref

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoceph-mixin: fix CephNodeNetworkPacket alerts 47868/head
Aswin Toni [Tue, 23 Aug 2022 08:30:12 +0000 (10:30 +0200)]
ceph-mixin: fix CephNodeNetworkPacket alerts

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 351e1ac63950164ea5f08a6bfc7c14af586bb208)

3 years agoceph-mixin: fix config inheritance
Aswin Toni [Thu, 18 Aug 2022 14:21:36 +0000 (16:21 +0200)]
ceph-mixin: fix config inheritance

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 35183140f60fe445de8d256fa08639b288b6e768)

3 years agoceph-mixin: Remove jsonnet building
Aswin Toni [Tue, 16 Aug 2022 14:17:21 +0000 (16:17 +0200)]
ceph-mixin: Remove jsonnet building

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 2e0e684fc20cbf6c2e48215b431419c8573b3863)

3 years agocmake: set $PATH for tests using jsonnet tools
Kefu Chai [Tue, 16 Aug 2022 02:52:53 +0000 (10:52 +0800)]
cmake: set $PATH for tests using jsonnet tools

otherwise they would not able to find executables installed into
${CMAKE_CURRENT_BINARY_DIR}.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 4a3afcf27769a512fba7e0194d2e3b6a55e06bca)

3 years agoprometheus: add multicluster support to alerts
Aswin Toni [Tue, 16 Aug 2022 13:38:18 +0000 (15:38 +0200)]
prometheus: add multicluster support to alerts

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 5cdc1c62c5de52a1f777f3d83fc85c3fc144db38)

3 years agomonitoring/ceph-mixin: clean up prometheus_alerts.yml
Anthony D'Atri [Tue, 26 Jul 2022 16:06:27 +0000 (09:06 -0700)]
monitoring/ceph-mixin: clean up prometheus_alerts.yml

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 9b6597446814ebced6ee6d963af18ce1a915e0bf)

3 years agoMerge pull request #48099 from adk3798/wip-57376-pacific
Adam King [Tue, 20 Sep 2022 19:17:58 +0000 (15:17 -0400)]
Merge pull request #48099 from adk3798/wip-57376-pacific

pacific: mgr/dashboard: enable addition of custom Prometheus alerts

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #48101 from adk3798/wip-57398-pacific
Adam King [Tue, 20 Sep 2022 14:06:37 +0000 (10:06 -0400)]
Merge pull request #48101 from adk3798/wip-57398-pacific

pacific: qa/cephadm: remove fsid dir before bootstrap in test_cephadm.sh

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #48097 from adk3798/wip-57503-pacific
Adam King [Tue, 20 Sep 2022 14:05:29 +0000 (10:05 -0400)]
Merge pull request #48097 from adk3798/wip-57503-pacific

pacific: qa/tasks/kubeadm: set up tigera resources via kubectl create

Reviewed-by: John Mulligan <jmulligan@redhat.com>
3 years agoMerge pull request #48096 from adk3798/wip-57528-pacific
Adam King [Tue, 20 Sep 2022 13:33:08 +0000 (09:33 -0400)]
Merge pull request #48096 from adk3798/wip-57528-pacific

pacific: mgr/cephadm: reconfig iscsi daemons if trusted_ip_list changes

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
3 years agomgr/dashboard: enable addition custom Prometheus alerts 48099/head
Patrick Seidensal [Thu, 25 Aug 2022 12:47:52 +0000 (14:47 +0200)]
mgr/dashboard: enable addition custom Prometheus alerts

Fixes: https://tracker.ceph.com/issues/57294
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 3551d7f8b36d883a72b85f0bd5568a33ac00e62c)

Conflicts:
doc/cephadm/services/monitoring.rst
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_services.py

3 years agoMerge pull request #48098 from adk3798/wip-57424-pacific
Adam King [Tue, 20 Sep 2022 13:11:06 +0000 (09:11 -0400)]
Merge pull request #48098 from adk3798/wip-57424-pacific

pacific: cephadm: Fix disk size calculation

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #48100 from adk3798/wip-57427-pacific
Adam King [Tue, 20 Sep 2022 13:09:30 +0000 (09:09 -0400)]
Merge pull request #48100 from adk3798/wip-57427-pacific

pacific: mgr/cephadm: allow setting prometheus retention time

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
3 years agoMerge pull request #48102 from adk3798/wip-57379-pacific
Adam King [Tue, 20 Sep 2022 13:07:48 +0000 (09:07 -0400)]
Merge pull request #48102 from adk3798/wip-57379-pacific

pacific: cephadm: return nonzero exit code when applying spec fails in bootstrap

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agoMerge pull request #48103 from adk3798/wip-57384-pacific
Adam King [Tue, 20 Sep 2022 13:06:50 +0000 (09:06 -0400)]
Merge pull request #48103 from adk3798/wip-57384-pacific

pacific: mgr/cephadm: Adding logic to store grafana cert/key per node

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
3 years agomgr/dashboard: fix rgw connect when using ssl 48189/head
Henry Hirsch [Wed, 20 Jul 2022 08:11:00 +0000 (10:11 +0200)]
mgr/dashboard: fix rgw connect when using ssl

connecting with the hostname instead of the ip address when using ssl

Fixes: http://tracker.ceph.com/issues/56970
Signed-off-by: Henry Hirsch <henry.hirsch@1und1.de>
(cherry picked from commit ca8f77d6a7fa361328a942e3f37c81dd9577d4de)

3 years agoMerge pull request #47888 from rhcs-dashboard/wip-57357-pacific
Pere Diaz Bou [Tue, 20 Sep 2022 08:19:12 +0000 (10:19 +0200)]
Merge pull request #47888 from rhcs-dashboard/wip-57357-pacific

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

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47636 from rhcs-dashboard/wip-57143-pacific
Nizamudeen A [Mon, 19 Sep 2022 19:30:10 +0000 (01:00 +0530)]
Merge pull request #47636 from rhcs-dashboard/wip-57143-pacific

pacific: mgr/dashboard: fix _rbd_image_refs caching

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agodoc/cephfs-top: adding doc for menu options 47998/head
Neeraj Pratap Singh [Fri, 6 May 2022 09:53:31 +0000 (15:23 +0530)]
doc/cephfs-top: adding doc for menu options

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

3 years agocephfs-top: adding filesystem menu
Neeraj Pratap Singh [Tue, 31 May 2022 12:55:00 +0000 (18:25 +0530)]
cephfs-top: adding filesystem menu

Cephfs-top now contains two options 'm' for filesystem
selection and 'q' to go back.The home screen displays
the clients belonging to a particular filesystem as a group.

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

3 years agocephfs-top: fixed flake8 errors
Neeraj Pratap Singh [Fri, 6 May 2022 07:46:28 +0000 (13:16 +0530)]
cephfs-top: fixed flake8 errors

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

3 years agoMerge pull request #47978 from neesingh-rh/wip-57439-pacific
Yuri Weinstein [Mon, 19 Sep 2022 16:24:04 +0000 (09:24 -0700)]
Merge pull request #47978 from neesingh-rh/wip-57439-pacific

pacific: cephfs-top: display average read/write/metadata latency

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #48045 from rhcs-dashboard/wip-57493-pacific
Pere Diaz Bou [Mon, 19 Sep 2022 16:14:12 +0000 (18:14 +0200)]
Merge pull request #48045 from rhcs-dashboard/wip-57493-pacific

pacific: mgr/dashboard: fix openapi-check

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agoMerge pull request #47995 from idryomov/wip-52810-pacific
Yuri Weinstein [Mon, 19 Sep 2022 15:50:38 +0000 (08:50 -0700)]
Merge pull request #47995 from idryomov/wip-52810-pacific

pacific: librbd: retry ENOENT in V2_REFRESH_PARENT as well

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agoMerge pull request #47866 from neesingh-rh/wip-57274-pacific
Yuri Weinstein [Mon, 19 Sep 2022 15:48:59 +0000 (08:48 -0700)]
Merge pull request #47866 from neesingh-rh/wip-57274-pacific

pacific: mgr/stats: missing clients in perf stats command output.

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com
3 years agoMerge pull request #47769 from neesingh-rh/wip-57263-pacific
Yuri Weinstein [Mon, 19 Sep 2022 15:46:39 +0000 (08:46 -0700)]
Merge pull request #47769 from neesingh-rh/wip-57263-pacific

pacific: mgr/volumes: Add volume info command

Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #47647 from joscollin/wip-57155-pacific
Yuri Weinstein [Mon, 19 Sep 2022 15:45:26 +0000 (08:45 -0700)]
Merge pull request #47647 from joscollin/wip-57155-pacific

pacific: cephfs-top: fix the rsp/wsp display

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
3 years agomgr/dashboard: Add details to the modal which displays the `safe-to-destroy` result 48176/head
Francesco Torchia [Fri, 26 Aug 2022 15:39:43 +0000 (17:39 +0200)]
mgr/dashboard: Add details to the modal which displays the `safe-to-destroy` result

- Add warnings type information in the case of the OSDs are not safe to destroy
- Add info type information in the case of the OSDs are safe to destroy

Fixes: https://tracker.ceph.com/issues/37327
Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
(cherry picked from commit 0d6100bbf99ffa8da0e099343ede050f1cca509c)

3 years agoMerge pull request #47386 from s0nea/wip-56990-pacific
Nizamudeen A [Mon, 19 Sep 2022 09:15:12 +0000 (14:45 +0530)]
Merge pull request #47386 from s0nea/wip-56990-pacific

pacific: monitoring/ceph-mixin: OSD overview typo fix

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
3 years agodoc/rados: update prompts in network-config-ref 48158/head
Zac Dover [Sat, 17 Sep 2022 20:59:47 +0000 (06:59 +1000)]
doc/rados: update prompts in network-config-ref

This PR adds unselectable prompts to network-config-
ref.rst.

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

3 years agoMerge pull request #47528 from lxbsz/wip-57083
Yuri Weinstein [Fri, 16 Sep 2022 11:52:16 +0000 (04:52 -0700)]
Merge pull request #47528 from lxbsz/wip-57083

pacific: qa/import-legacy: install python3 package for nautilus ceph

Reviewed-by: Kotresh HR khiremat@redhat.com
3 years agodoc: include read, write, metadata average latencies in doc/man. 47978/head
Venky Shankar [Wed, 19 May 2021 07:03:49 +0000 (03:03 -0400)]
doc: include read, write, metadata average latencies in doc/man.

Also, the sample cephfs-top image in the doc is outdated. Update that!

Fixes: http://tracker.ceph.com/issues/48619
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit aa04f3faedb6edcb0897e802a8390904deb6f936)

3 years agocephfs-top: display latency in milliseconds
Venky Shankar [Wed, 19 May 2021 05:29:15 +0000 (01:29 -0400)]
cephfs-top: display latency in milliseconds

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit bf261f2a07111361ec8db36a7a4b13b54ff5d891)

3 years agocephfs-top: switch to displaying average latencies and stdev
Venky Shankar [Wed, 19 May 2021 05:27:12 +0000 (01:27 -0400)]
cephfs-top: switch to displaying average latencies and stdev

Do away with cumulative latencies -- those are not much useful.
However, these types need to be maintained since `perf stats`
command (via mgr/stats plugin) includes them. So, maintain a
legacy metrics list which is ignored when choosing metrics to
display.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 60f33a8ca3055ec5ae5c8d67fd03f571bcec8892)

3 years agomgr/stats: include average latencies and stdev in `perf stat` dump
Venky Shankar [Wed, 19 May 2021 05:19:34 +0000 (01:19 -0400)]
mgr/stats: include average latencies and stdev in `perf stat` dump

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit b2bc45223b02ded7a5cc921980b3961c5e1d5893)

3 years agomgr/stats: auto generate metrics names from configured metrics
Venky Shankar [Wed, 19 May 2021 05:18:51 +0000 (01:18 -0400)]
mgr/stats: auto generate metrics names from configured metrics

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit aaeec93efd2ae03d740299a5b22bb9203fbd7b8d)

3 years agoclient: forward read, write, metadata average latency and stdev
Venky Shankar [Wed, 19 May 2021 05:18:00 +0000 (01:18 -0400)]
client: forward read, write, metadata average latency and stdev

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 9b4f210b58571c0d88e5e01b90e6106cd894c3be)

Conflicts:
src/client/Client.cc:Added 'if' condition in read,write and
metadata latencies in 'Client::collect_and_send_global_metrics()'

3 years agomds, mgr: plumb in new client metrics
Venky Shankar [Wed, 19 May 2021 05:16:22 +0000 (01:16 -0400)]
mds, mgr: plumb in new client metrics

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit f1083c0b3d41e6691945e8b40df8aa707a261217)

Conflicts:
src/include/cephfs/metrics/Types.h:instead of std::ostream
using ostream as is used in other places for latencies.

3 years agoclient: track average read, write and metadata IO latencies
Venky Shankar [Wed, 19 May 2021 05:02:05 +0000 (01:02 -0400)]
client: track average read, write and metadata IO latencies

And also standard deviation for each to measure the variance
(volatility) of latencies.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 967e24fe5c0efd9d7eb870494610fd1b4412f1d6)

3 years agoqa: add test_perf_stats_stale_metrics_with_multiple_filesystem 47866/head
Neeraj Pratap Singh [Wed, 13 Jul 2022 09:23:13 +0000 (14:53 +0530)]
qa: add test_perf_stats_stale_metrics_with_multiple_filesystem

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

Conflicts:
qa/tasks/cephfs/test_mds_metrics.py

3 years agomgr/stats: missing clients in perf stats command output.
Neeraj Pratap Singh [Thu, 7 Jul 2022 20:25:54 +0000 (01:55 +0530)]
mgr/stats: missing clients in perf stats command output.

perf stats doesn't get the client info w.r.t new filesystems
created or filesystems created on failing other filesystem
after running the perf stats command once with existing filesystems.

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

3 years agoMerge pull request #47972 from vshankar/tr-55931
Yuri Weinstein [Fri, 16 Sep 2022 00:27:17 +0000 (17:27 -0700)]
Merge pull request #47972 from vshankar/tr-55931

pacific: client: allow overwrites to file with size greater than the max_file_size

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47923 from petrutlucian94/wip-57403-pacific
Yuri Weinstein [Thu, 15 Sep 2022 22:26:24 +0000 (15:26 -0700)]
Merge pull request #47923 from petrutlucian94/wip-57403-pacific

pacific: include: fix IS_ERR on Windows

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #47862 from lxbsz/wip-57252
Yuri Weinstein [Thu, 15 Sep 2022 22:25:16 +0000 (15:25 -0700)]
Merge pull request #47862 from lxbsz/wip-57252

pacific: libcephfs: define AT_NO_ATTR_SYNC back for backward compatibility

Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #47851 from joscollin/wip-57279-pacific
Yuri Weinstein [Thu, 15 Sep 2022 22:22:53 +0000 (15:22 -0700)]
Merge pull request #47851 from joscollin/wip-57279-pacific

pacific: mgr/stats: change in structure of perf_stats o/p

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
3 years agoclient: abort the client if we couldn't invalidate dentry caches 48109/head
Xiubo Li [Mon, 15 Aug 2022 07:15:43 +0000 (15:15 +0800)]
client: abort the client if we couldn't invalidate dentry caches

The option 'client_die_on_failed_dentry_invalidate' requires to kill
the client when fails to invalidate the dentry caches from kernel.
The CephFS client requires a mechanism to invalidate dentries in the
caller (e.g. the kernel for ceph-fuse) when capabilities must be recalled.
If the client cannot do this then the MDS cache cannot shrink which
can cause the MDS to fail.

Introduced by commit 8c778e79840f1aa9b9731e2ef20881da0d122fda.

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

3 years agoclient: stop the remount_finisher thread in the Client::unmount() 48108/head
Xiubo Li [Mon, 15 Aug 2022 09:50:27 +0000 (17:50 +0800)]
client: stop the remount_finisher thread in the Client::unmount()

The ceph_fuse will unmount the client and then finalize the cfuse
and at the same will free the mountpoint memory. And at last will
try to stop the remount_finisher thread. But the remount_finisher
thread will use the freed mountpoint to do the remount, which will
case unexpected remount failures.

Just stop the remount_finisher thread in the Client::unmount().

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

3 years agoosd, mds: fix the "heap" admin cmd printing always to error stream 48106/head
Radoslaw Zarzynski [Wed, 17 Aug 2022 12:44:42 +0000 (12:44 +0000)]
osd, mds: fix the "heap" admin cmd printing always to error stream

Before the patch `ceph::osd_cmds::heap()` was confusing
the concepts of _stderr_ and _stdout_. This  was the direct
cause of the differences in output between `ceph tell` and
`ceph daeamon`.

Thanks to Laura Flores who made the extremely useful observation
noted in https://tracker.ceph.com/issues/57119#note-3.

Fixes: https://tracker.ceph.com/issues/57119
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 94436475c4c9a11a94dd21c619c9ae0014ac393d)

3 years agomgr/cephadm: Adding logic to store grafana cert/key per node 48103/head
Redouane Kachach [Thu, 14 Jul 2022 11:36:32 +0000 (13:36 +0200)]
mgr/cephadm: Adding logic to store grafana cert/key per node
Fixes: https://tracker.ceph.com/issues/56508
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 3c990f974e3beac0fc03f58c4c47f26f9d5afe56)

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

3 years agocephadm: return nonzero exit code when applying spec fails in bootstrap 48102/head
Adam King [Wed, 17 Aug 2022 20:54:54 +0000 (16:54 -0400)]
cephadm: return nonzero exit code when applying spec fails in bootstrap

This is mostly useful for testing automation, but right now if applying the
spec provided with --apply-spec fails, the return code remains zero. We don't
want to error out entirely in that case as we still want to print the remaining
output (e.g. the dashboard password). Continuing onward and then returning a
nonzero code could provide a balance where we still give all the output but
still have something to make it easier for those writing automation around bootstrap.

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

3 years agoqa/cephadm: remove fsid dir before bootstrap in test_cephadm.sh 48101/head
Adam King [Wed, 24 Aug 2022 19:13:15 +0000 (15:13 -0400)]
qa/cephadm: remove fsid dir before bootstrap in test_cephadm.sh

The shell commands we test beforehand can create the
/var/lib/ceph/00000000-0000-0000-0000-0000deadbeef directory
and that directory being present will block bootstrap as
it will think a cluster with this fsid alreayd exists

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

3 years agodoc/cephadm: documentation for setting prometheus retention time 48100/head
Adam King [Mon, 22 Aug 2022 17:47:53 +0000 (13:47 -0400)]
doc/cephadm: documentation for setting prometheus retention time

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

3 years agomgr/cephadm: allow setting prometheus retention time
Adam King [Mon, 22 Aug 2022 15:14:12 +0000 (11:14 -0400)]
mgr/cephadm: allow setting prometheus retention time

When we deploy Prometheus server, we don't provide any
ability to define the tsdb retention time - so it defaults to 15d.

This change adds a field that can be passed in a prometheus service
spec that will be passed as an arg to the --storage.tsdb.retention.time
parameter for the prometheus daemon.

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

Conflicts:
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py

3 years agocephadm: Fix disk size calculation 48098/head
Paul Cuzner [Mon, 29 Aug 2022 23:54:00 +0000 (11:54 +1200)]
cephadm: Fix disk size calculation

With native 4k sectors, the logical blocksize is set to
4096, which yields a disk size 8x the size of the actual
device. According to kernel source, device size only
uses 512 byte sectors, so the use of logical blocksize
is unnecessary.

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

3 years agoqa/tasks/kubeadm: set up tigera resources via kubectl create 48097/head
John Mulligan [Mon, 29 Aug 2022 14:03:01 +0000 (10:03 -0400)]
qa/tasks/kubeadm: set up tigera resources via kubectl create

Fixes: https://tracker.ceph.com/issues/57268
The tigera operator for the calico CNI has some pretty large resource
definitions. The length of the definitions can cause the "client side
apply", the default mode for `kubectl apply ....`, to fail due to the
length of the needed annotation that would result:

```
2022-08-22T20:24:55.636 INFO:teuthology.orchestra.run.smithi087.stdout:clusterrolebinding.rbac.authorization.k8s.io/tigera-operator created
2022-08-22T20:24:55.670 INFO:teuthology.orchestra.run.smithi087.stdout:deployment.apps/tigera-operator created
2022-08-22T20:24:55.671 INFO:teuthology.orchestra.run.smithi087.stderr:The CustomResourceDefinition "installations.operator.tigera.io" is invalid: metadata.annotations: Too long: must have at most 262144 bytes
2022-08-22T20:24:55.674 DEBUG:teuthology.orchestra.run:got remote process result: 1
```

There are two simple options for avoiding this error. One is to use
`kubectl create`. The create command will not make this lengthy
annotation. It will fail if any of the resources already exist. The
other option is to use server-side apply, via the `kubectl apply
--server-side ...` command. It is new in k8s 1.18. It will not create
the annotation either.

The block of code setting up the CNI already uses `kubectl create` to
create the custom resources that configure the tigera operator.
Therefore it should be safe to assume the block of code in question
doesn't need to be idempotent and we can also use `kubectl create`
elsewhere in the same block.

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

3 years agomgr/cephadm: reconfig iscsi daemons if trusted_ip_list changes 48096/head
Adam King [Tue, 9 Aug 2022 20:13:38 +0000 (16:13 -0400)]
mgr/cephadm: reconfig iscsi daemons if trusted_ip_list changes

This is necessary as iscsi daemons expect the iscsi-gateway.cfg
which includes this list to match across the iscsi daemons

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

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

3 years agoMerge pull request #48060 from zdover23/wip-doc-2022-09-13-backport-47575-to-pacific
zdover23 [Wed, 14 Sep 2022 07:46:59 +0000 (17:46 +1000)]
Merge pull request #48060 from zdover23/wip-doc-2022-09-13-backport-47575-to-pacific

pacific: doc/rados: add prompts to pools.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agoMerge pull request #48062 from zdover23/wip-doc-2022-09-13-backport-47305-to-pacific
zdover23 [Wed, 14 Sep 2022 03:28:33 +0000 (13:28 +1000)]
Merge pull request #48062 from zdover23/wip-doc-2022-09-13-backport-47305-to-pacific

pacific: doc/monitoring: add min vers of apps in mon stack

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/cephadm: document recommended syntax for mounting files with ECA 48069/head
Adam King [Wed, 7 Sep 2022 19:42:30 +0000 (15:42 -0400)]
doc/cephadm: document recommended syntax for mounting files with ECA

Mounting files with extra container args seems to not
work with some of the more intuitive syntaxes.
See https://tracker.ceph.com/issues/57338

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

Conflicts:
doc/cephadm/services/index.rst

3 years agodoc/monitoring: add min vers of apps in mon stack 48062/head
Zac Dover [Wed, 27 Jul 2022 14:27:42 +0000 (00:27 +1000)]
doc/monitoring: add min vers of apps in mon stack

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

This PR adds recommended versions of grafana and
prometheus and alert manager.

This PR is a second attempt at getting the information
in the following PR into the docs:
https://github.com/ceph/ceph/pull/46000/files

Himadri Maheshwari deserves the credit for the work
in this commit.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Signed-off-by: Himadri Maheshwari <himadri.maheshwari7915@gmail.com>
(cherry picked from commit 367695f5b09f75ee723d53116e2f4a6e45dd795d)

3 years agodoc/rados: add prompts to pools.rst 48060/head
Zac Dover [Fri, 12 Aug 2022 21:53:21 +0000 (07:53 +1000)]
doc/rados: add prompts to pools.rst

This commit adds ".. prompt:: bash $"-style prompts to pools.rst.
This brings this file up to the standard established in 2020 when
Kefu added support for the ".. prompt::" directive.

This commit is a part of an initiative to modernize the presentation
of all BASH commands in the RADOS documentation.

The progress of this project can be tracked here:
https://tracker.ceph.com/issues/57108

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

3 years agodoc/cephadm: correct version staggered upgrade got in pacific 48056/head
Adam King [Wed, 7 Sep 2022 19:19:02 +0000 (15:19 -0400)]
doc/cephadm: correct version staggered upgrade got in pacific

This didn't end up making 16.2.10 so the first version
it will actually be available is 16.2.11

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

3 years agoMerge pull request #47823 from zdover23/wip-doc-2022-08-27-backport-47810-to-pacific
zdover23 [Mon, 12 Sep 2022 16:23:58 +0000 (02:23 +1000)]
Merge pull request #47823 from zdover23/wip-doc-2022-08-27-backport-47810-to-pacific

pacific: doc/mgr: add prompt directives to dashboard.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agomgr/dashboard: fix snapshot creation with duplicate name 48048/head
Aashish Sharma [Mon, 5 Sep 2022 11:59:11 +0000 (17:29 +0530)]
mgr/dashboard: fix snapshot creation with duplicate name

Snapshot creation with same name on UI throwing 500 Internal Error, This PR intends to fix this issue.

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

3 years agomgr/dashboard: docs gen tags sort 48045/head
Pere Diaz Bou [Fri, 9 Sep 2022 09:18:42 +0000 (11:18 +0200)]
mgr/dashboard: docs gen tags sort

When generating tags the order of endpoints wasn't taken into account.
Two endpoints with the same url prefix, for example `/api/cluster/` and
`/api/cluster/user`, have different docs and the tags is generated from
a doc of one of these two, and since the order of these endpoints might
vary it is imperative to sort them to have a deterministic output.

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