]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
3 weeks agoMerge pull request #65235 from afreen23/backport-status-api
afreen23 [Wed, 27 Aug 2025 11:40:57 +0000 (17:10 +0530)]
Merge pull request #65235 from afreen23/backport-status-api

tentacle: Backport of /health/snapshot api and its dependencies

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 weeks agoMerge pull request #65241 from afreen23/wip-72733-tentacle
afreen23 [Wed, 27 Aug 2025 10:08:38 +0000 (15:38 +0530)]
Merge pull request #65241 from afreen23/wip-72733-tentacle

tentacle: mgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 weeks agomgr/dashboard: Remove .nx folder
Afreen Misbah [Tue, 26 Aug 2025 13:59:10 +0000 (19:29 +0530)]
mgr/dashboard: Remove .nx folder
The nx folder was commited by mistake in PR #65107

Fixes https://tracker.ceph.com/issues/72730

Signed-off-by: Afreen Misbah <afreen@ibm.com>
3 weeks agoMerge pull request #65203 from rhcs-dashboard/wip-72625-tentacle
afreen23 [Tue, 26 Aug 2025 17:04:28 +0000 (22:34 +0530)]
Merge pull request #65203 from rhcs-dashboard/wip-72625-tentacle

tentacle: mgr/dashboard: Target Storage Class in s3 tiering Config

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 weeks agoMerge pull request #65224 from rhcs-dashboard/wip-72711-tentacle
afreen23 [Tue, 26 Aug 2025 15:18:59 +0000 (20:48 +0530)]
Merge pull request #65224 from rhcs-dashboard/wip-72711-tentacle

tentacle: mgr/dashboard : Optimized /host API to minimum resp

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 weeks agoMerge pull request #65225 from rhcs-dashboard/wip-72712-tentacle
afreen23 [Tue, 26 Aug 2025 14:30:21 +0000 (20:00 +0530)]
Merge pull request #65225 from rhcs-dashboard/wip-72712-tentacle

tentacle: mgr/dashboard : 72522 - Remove service instances column to imporve API perf

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 weeks agomgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses
Afreen Misbah [Thu, 21 Aug 2025 09:41:43 +0000 (15:11 +0530)]
mgr/dashboard: Dashboard nfs export editor rejects ipv6 addresses

Fixes https://tracker.ceph.com/issues/72660

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 6c9a5536f3459cb3e676e240730eb5f7c45352ff)

3 weeks agomgr/dashboard: Add /health/snapshot api
Afreen Misbah [Wed, 13 Aug 2025 06:49:02 +0000 (12:19 +0530)]
mgr/dashboard: Add /health/snapshot api

Fixes https://tracker.ceph.com/issues/72609

- The current minimal API relies on fetching data from osdmap and pgmap.
- These commands produce large, detailed payloads that become a performance bottleneck and impact scalability, especially in large clusters.
- To address this, we propose switching to the ceph snapshot API using ceph status command, which retrieves essential information directly from the cluster map.
- ceph status is significantly more lightweight compared to osdmap/pgmap, reducing payload sizes and processing overhead.
- This change ensures faster response times, improves system efficiency in large deployments, and minimizes unnecessary data transfer.
- update tests

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 2609d4f62e9e3906cf3e3fcc042bfdf0bcc633bf)

 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
src/pybind/mgr/dashboard/frontend/package.json
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html

3 weeks agomgr/dashboard:Fixed issue with clipboard icon
Afreen Misbah [Thu, 10 Jul 2025 20:29:12 +0000 (01:59 +0530)]
mgr/dashboard:Fixed issue with clipboard icon

- clipboard icon not displaying breaking several places
- cliboard icon on click gets filed primary green color losing the visibilty of icon. The icon now remain visible on click
- clipboard button for path and copy in tables on mouseover does not give `hand` but `cursor`. which was not ideal from a usability standpoint. This behavior has been updated to use the hand cursor making the interaction semantically correct and more intuitive for users.

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 1dd42e1a339ef4cf1f3253534646aa6c9342233d)

Conflicts:
       src/pybind/mgr/dashboard/frontend/src/app/shared/components/copy2clipboard-button/copy2clipboard-button.component.html

3 weeks agomgr/dashboard: Add generic component for icons
Afreen Misbah [Thu, 3 Jul 2025 11:09:25 +0000 (16:39 +0530)]
mgr/dashboard: Add generic component for icons

Fixes https://tracker.ceph.com/issues/71947
Fixes https://tracker.ceph.com/issues/71933

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit fa5160444e71b09e2e845c040206e34c775c27ff)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
src/pybind/mgr/dashboard/frontend/src/styles/_carbon-defaults.scss

3 weeks agoMerge pull request #65106 from afreen23/wip-72525-tentacle
afreen23 [Tue, 26 Aug 2025 12:57:15 +0000 (18:27 +0530)]
Merge pull request #65106 from afreen23/wip-72525-tentacle

tentacle: mgr/dashboard: Stop rules api being polled on every page

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 weeks agoMerge pull request #65107 from afreen23/wip-72607-tentacle
afreen23 [Tue, 26 Aug 2025 09:03:51 +0000 (14:33 +0530)]
Merge pull request #65107 from afreen23/wip-72607-tentacle

tentacle: Replace capacity threshold data with prometheus metrics

Reviewed-by: Nizamudeen A <nia@redhat.com>
3 weeks agoMerge pull request #65148 from cloudbehl/wip-72639-tentacle
Aashish Sharma [Tue, 26 Aug 2025 08:19:43 +0000 (13:49 +0530)]
Merge pull request #65148 from cloudbehl/wip-72639-tentacle

tentacle: prometheus: Add RBD image metadata to prometheus

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 weeks agoMerge pull request #65226 from aaSharma14/wip-72688-tentacle
Aashish Sharma [Tue, 26 Aug 2025 08:02:37 +0000 (13:32 +0530)]
Merge pull request #65226 from aaSharma14/wip-72688-tentacle

tentacle: Handle failures in metric parsing

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
3 weeks agoMerge pull request #65223 from rhcs-dashboard/wip-72716-tentacle
afreen23 [Tue, 26 Aug 2025 07:22:33 +0000 (12:52 +0530)]
Merge pull request #65223 from rhcs-dashboard/wip-72716-tentacle

tentacle: mgr/dashboard: rgw_crypt_kmip_addr in SSE-KMS kmip address input field validation updated

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 weeks agomgr/dashboard: Fix test_host.py test case
Abhishek Desai [Mon, 25 Aug 2025 14:11:45 +0000 (19:41 +0530)]
mgr/dashboard: Fix test_host.py test case
fixes: https://tracker.ceph.com/issues/72717

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
3 weeks agoHandle failures in metric parsing
Anmol Babu [Thu, 3 Jul 2025 13:25:39 +0000 (18:55 +0530)]
Handle failures in metric parsing

fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2345460
Signed-off-by: Anmol Babu <anmolbabu@Anmols-MacBook-Pro.local>
(cherry picked from commit f29e3f307c46401328e920204cbe893fbd837c65)

3 weeks agomgr/dashboard : 72522 - Remove service instances column to imporve API perf
Abhishek Desai [Mon, 11 Aug 2025 11:53:52 +0000 (17:23 +0530)]
mgr/dashboard : 72522 - Remove service instances column to imporve API perf
fixes : https://tracker.ceph.com/issues/72522

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 1dbebbd86c434137829fb9fce88cdc368f9d4993)

3 weeks agomgr/dashboard : Optimized /host API to minimum resp
Abhishek Desai [Sun, 17 Aug 2025 18:37:47 +0000 (00:07 +0530)]
mgr/dashboard : Optimized /host API to minimum resp
fixes : https://tracker.ceph.com/issues/72608

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit cd2d91a6e78af339c86a24e42bdb705d854262f5)

3 weeks agomgr/dashboard: rgw_crypt_kmip_addr in SSE-KMS kmip address input field validation...
Abhishek Desai [Mon, 4 Aug 2025 19:30:52 +0000 (01:00 +0530)]
mgr/dashboard: rgw_crypt_kmip_addr in SSE-KMS kmip address input field validation updated
fixes : https://tracker.ceph.com/issues/72408

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 4aa462b091780dcfc7a297e57b314ba5a3a479fe)

3 weeks agoMerge pull request #65072 from baum/72508_backport tentacle
Yuri Weinstein [Mon, 25 Aug 2025 21:06:46 +0000 (14:06 -0700)]
Merge pull request #65072 from baum/72508_backport

tentacle: nvmeof: create /dev/dsa if DSA acceleration is enabled and the device…

Reviewed-by: Adam King adking@redhat.com
3 weeks agomgr/dashboard: Replace capacity threshold data with prometheus metrics
Afreen Misbah [Mon, 11 Aug 2025 09:03:32 +0000 (14:33 +0530)]
mgr/dashboard: Replace capacity threshold data with prometheus metrics

- Fixes https://tracker.ceph.com/issues/72519
- the osd dump metrics is used in /api/osd/settings
- this metrics creates perf bottleneck when osds are 1000s
- replacing with similar prometheus metrics
- minor refactors - including renaming, comments.

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 3281ccfe3542e22e141681cba77cc7970ba10e7b)

Conflicts:
    src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.ts
    src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.ts

3 weeks agomgr/dashboard: Stop rules api being polled on every page
Afreen Misbah [Wed, 6 Aug 2025 07:37:16 +0000 (13:07 +0530)]
mgr/dashboard: Stop rules api being polled on every page

- /rules ar epolled every 5 seconds on every page
- it is only required for alerts page where full rules list is shown in `Alerts` tab
- also added observable for getting rules instead of plain array

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit df984d72df1370181328dc3ec30a22619841c185)

3 weeks agoMerge pull request #65100 from rhcs-dashboard/wip-72622-tentacle
afreen23 [Mon, 25 Aug 2025 13:47:44 +0000 (19:17 +0530)]
Merge pull request #65100 from rhcs-dashboard/wip-72622-tentacle

tentacle: mgr/dashboard: add tab structure to File Systems page and embed Ceph-Filesystem Overview dashboard

Reviewed-by: Afreen Misbah <afreen@ibm.com>
3 weeks agomgr/dashboard: [RGW] - Target Storage Class in s3 tiering config
Dnyaneshwari [Thu, 14 Aug 2025 05:15:52 +0000 (10:45 +0530)]
mgr/dashboard: [RGW] - Target Storage Class in s3 tiering config

Fixes: https://tracker.ceph.com/issues/72583
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
(cherry picked from commit 0478bf227e77a986217adc7b1b28d1568661fb32)

3 weeks agoMerge pull request #65110 from rhcs-dashboard/wip-72492-tentacle
afreen23 [Mon, 25 Aug 2025 09:22:10 +0000 (14:52 +0530)]
Merge pull request #65110 from rhcs-dashboard/wip-72492-tentacle

tentacle: mgr/dashboard: fix table loading while fetching data

Reviewed-by: Naman Munet <nmunet@redhat.com>
4 weeks agoMerge pull request #65179 from phlogistonjohn/jjm-tentacle-bwc
David Galloway [Fri, 22 Aug 2025 15:22:17 +0000 (11:22 -0400)]
Merge pull request #65179 from phlogistonjohn/jjm-tentacle-bwc

tentacle: backport build-with-container patches from main

4 weeks agoMerge pull request #65124 from zdover23/wip-doc-2025-08-19-backport-64929-to-tentacle
Zac Dover [Fri, 22 Aug 2025 08:46:33 +0000 (18:46 +1000)]
Merge pull request #65124 from zdover23/wip-doc-2025-08-19-backport-64929-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65121 from zdover23/wip-doc-2025-08-19-backport-65021-to-tentacle
Zac Dover [Fri, 22 Aug 2025 08:46:08 +0000 (18:46 +1000)]
Merge pull request #65121 from zdover23/wip-doc-2025-08-19-backport-65021-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65092 from zdover23/wip-doc-2025-08-18-backport-64931-to-tentacle
Zac Dover [Fri, 22 Aug 2025 08:45:46 +0000 (18:45 +1000)]
Merge pull request #65092 from zdover23/wip-doc-2025-08-18-backport-64931-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agobuild-with-container: improve source rpm detection
John Mulligan [Tue, 19 Aug 2025 23:12:07 +0000 (19:12 -0400)]
build-with-container: improve source rpm detection

Improve source rpm detection by adding a new detection method that
executes and rpm command in a container to get exactly the version of
the source rpm that the ceph.spec file would have generated.  For
backwards compatibility and that I don't entirely trust myself to have
tested this the old methods are still available.

The old `--rpm-no-match-sha` is now an alias for `--srpm-match=any` to
cause it to build any (unique) ceph srpm it finds.
`--srpm-match=versionglob` retains the previous default behavior of
using a glob matching on the git id or ceph version value.  The new
default of `--srpm-match=auto` implements the rpm command based behavior
described above.

All of this is wrapped in a new step `find-rpm` but that's mostly an
implementation detail and for testing.

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

4 weeks agomake-srpm.sh: don't shell out redundantly to pwd
John Mulligan [Tue, 19 Aug 2025 19:03:51 +0000 (15:03 -0400)]
make-srpm.sh: don't shell out redundantly to pwd

Just something that annoyed me while reading the script.

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

4 weeks agopybind/mgr/dashboard/frontend: add NPM_CACHEDIR envvar, use in bwc
Dan Mick [Wed, 13 Aug 2025 19:16:45 +0000 (12:16 -0700)]
pybind/mgr/dashboard/frontend: add NPM_CACHEDIR envvar, use in bwc

Add an optional NPM_CACHEDIR environment variable to serve as the
cache parameter for npm in the dashboard frontend build.  The idea
is to allow it to persist across builds so that we decrease the load
on registry.npmjs.org, which has been throttling our requests when
using build-with-container.py, and also hopefully improve the time
of the frontend npm operations.

build-with-container.py also grows a --npm-cache-path option to allow
setting it for container builds and passing the envvar to the build.

Fixes: https://tracker.ceph.com/issues/72298
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit ad7e6117a9e99061a3ad7e03709dd31e34832966)

4 weeks agodashboard: fix the workaround for unpacking node sources
John Mulligan [Wed, 21 May 2025 21:46:40 +0000 (17:46 -0400)]
dashboard: fix the workaround for unpacking node sources

My previous workaround in the dashboard for the unpacking of non-root
own tarball as the fake root of a container did not work because of the
strange quoting/escaping behavior of cmake (it tried to run `id -u` as a
single command, not a command and an argument).
Use single quoted string and old school backticks to work around this issue.

Fixes: 24dbfb5da4813c6588f9cd199b9f527bb67f1e88
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 3a36180a373d91adcf9726660204f0cc1dcecba3)

4 weeks agodashboard: ensure nodeenv downloaded content is owned by current user
John Mulligan [Fri, 2 May 2025 15:17:53 +0000 (11:17 -0400)]
dashboard: ensure nodeenv downloaded content is owned by current user

When testing ceph builds in a container we discovered that certain files
could not be deleted by jenkins after a build. This was due to the way
the container maps IDs - files owned by the root user in the container
become owned by the "real" user/jenkins user on the "host".
However, the node tarball that is fetched and unpacked by nodeenv has
a different owner name/uid that is preserved in the tree and this id
gets mapped to something that can be managed by the "fake root" of the
container but not by the "regular" user outside the container.

The simplest workaround I can think of is to chown the tree back
to the current user and avoid leaving files on disk with uncleanly
mapped uids.

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

4 weeks agoscript/build-with-container: support --build-arg arguments
John Mulligan [Fri, 20 Jun 2025 23:46:16 +0000 (19:46 -0400)]
script/build-with-container: support --build-arg arguments

Allow passing --build-arg arguments to build-with-container.py
which are passed directly to the container build command.
This allows a developer to toggle certain features of the build
container, however this should not be used in CI.

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

4 weeks agoDockerfile.build: make WITH_CRIMSON a build arg
John Mulligan [Fri, 20 Jun 2025 23:34:45 +0000 (19:34 -0400)]
Dockerfile.build: make WITH_CRIMSON a build arg

We've chosen to enable crimson by default to match the CI, but that
is not always something a developer may want, so make WITH_CRIMSON
a build argument that can be toggled off if necessary.

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

4 weeks agomgr/dashboard: add a cobertura xml file workaround variable
John Mulligan [Thu, 29 May 2025 17:41:45 +0000 (13:41 -0400)]
mgr/dashboard: add a cobertura xml file workaround variable

Add an environment variable REWRITE_COVERAGE_ROOTDIR that
changes the "hardcoded" path in the cobertura-coverage.xml file.
This can be used to map the paths used in a container build to
the paths known to a jenkins job (or whatever else you want to
do with the file).

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

4 weeks agoscript/build-with-container: remove unused build arg
John Mulligan [Thu, 29 May 2025 14:21:49 +0000 (10:21 -0400)]
script/build-with-container: remove unused build arg

Remove the unused build arg for JENKINS_HOME. This was
once used to try and create build images like the CI jobs. However,
the env var is now unconditionally set in the build script and must
be passed (or not) explicitly by the user.

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

4 weeks agoscript/build-with-container: add workarounds for older python versions
John Mulligan [Fri, 13 Jun 2025 00:37:56 +0000 (20:37 -0400)]
script/build-with-container: add workarounds for older python versions

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

4 weeks agoscript/build-with-container: handle failure to find source rpm better
John Mulligan [Thu, 8 May 2025 17:22:52 +0000 (13:22 -0400)]
script/build-with-container: handle failure to find source rpm better

Don't use an obscure assert, raise an exception with a helpful error
message.

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

4 weeks agoscript/build-with-container: fix rpm build step when using an overlay
John Mulligan [Thu, 8 May 2025 15:21:32 +0000 (11:21 -0400)]
script/build-with-container: fix rpm build step when using an overlay

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

4 weeks agoscript/build-with-container: fix rpmbuild when no rpm build args are set
John Mulligan [Thu, 8 May 2025 15:21:11 +0000 (11:21 -0400)]
script/build-with-container: fix rpmbuild when no rpm build args are set

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

4 weeks agoscript/build-with-container: cache git branch result
John Mulligan [Fri, 21 Mar 2025 18:28:25 +0000 (14:28 -0400)]
script/build-with-container: cache git branch result

Cache the branch we got from the git command as it is highly unlikely
to change during the script execution and if it does -- we mostly don't
care anyway.

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

4 weeks agoscript/build-with-container: detect when cached build images need rebuilding
John Mulligan [Fri, 21 Mar 2025 17:53:16 +0000 (13:53 -0400)]
script/build-with-container: detect when cached build images need rebuilding

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

4 weeks agoscript/build-with-container: add log line with time taken
John Mulligan [Thu, 20 Mar 2025 21:03:43 +0000 (17:03 -0400)]
script/build-with-container: add log line with time taken

Add a log line with time taken to the output of the script, this can
help to see at a glance how long a particular bwc step took.

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

4 weeks agoMerge pull request #65000 from phlogistonjohn/jjm-samba-ceph20
Adam King [Thu, 21 Aug 2025 14:52:35 +0000 (10:52 -0400)]
Merge pull request #65000 from phlogistonjohn/jjm-samba-ceph20

tentacle: switch samba container images to use "ceph20" packages

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anoop C S <anoopcs@cryptolab.net>
4 weeks agoMerge pull request #65111 from rhcs-dashboard/wip-72548-tentacle
Nizamudeen A [Thu, 21 Aug 2025 11:05:08 +0000 (16:35 +0530)]
Merge pull request #65111 from rhcs-dashboard/wip-72548-tentacle

tentacle: mgr/dashboard: fix table dom re-rendering

4 weeks agoMerge pull request #65112 from rhcs-dashboard/wip-72521-tentacle
Nizamudeen A [Thu, 21 Aug 2025 11:04:53 +0000 (16:34 +0530)]
Merge pull request #65112 from rhcs-dashboard/wip-72521-tentacle

tentacle: mgr/dashboard: fix memory leak in prometheus service

4 weeks agoMerge pull request #65113 from rhcs-dashboard/wip-72537-tentacle
Nizamudeen A [Thu, 21 Aug 2025 11:04:38 +0000 (16:34 +0530)]
Merge pull request #65113 from rhcs-dashboard/wip-72537-tentacle

tentacle: mgr/dashboard: loading state for inventory card

4 weeks agoMerge pull request #65064 from anoopcs9/tentacle-libcephfs-proxy-optimization
Venky Shankar [Thu, 21 Aug 2025 09:04:34 +0000 (14:34 +0530)]
Merge pull request #65064 from anoopcs9/tentacle-libcephfs-proxy-optimization

tentacle: Optimize the libcephfs proxy to reduce the overhead

Reviewed-by: Sachin Prabhu <sp@spui.uk>
4 weeks agoprometheus: Add RBD image metadata to prometheus
Ankush Behl [Tue, 5 Aug 2025 13:35:22 +0000 (19:05 +0530)]
prometheus: Add RBD image metadata to prometheus

Fixes: https://tracker.ceph.com/issues/72421
Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
(cherry picked from commit 45db5f38b0abfec49d9f8904d67dbcccb846393f)

4 weeks agoMerge pull request #65117 from cloudbehl/wip-72534-tentacle
afreen23 [Wed, 20 Aug 2025 07:45:40 +0000 (13:15 +0530)]
Merge pull request #65117 from cloudbehl/wip-72534-tentacle

tentacle: prometheus: Add OSD full and nearfull ratio to prometheus

Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 weeks agoMerge pull request #65114 from rhcs-dashboard/wip-72633-tentacle
afreen23 [Wed, 20 Aug 2025 07:39:03 +0000 (13:09 +0530)]
Merge pull request #65114 from rhcs-dashboard/wip-72633-tentacle

tentacle: mgr/dashboard: close token status subscription properly

Reviewed-by: Naman Munet <nmunet@redhat.com>
4 weeks agoMerge pull request #65105 from ljflores/wip-72629-tentacle
Yuri Weinstein [Tue, 19 Aug 2025 22:43:19 +0000 (15:43 -0700)]
Merge pull request #65105 from ljflores/wip-72629-tentacle

tentacle: debian/control: install libnuma-dev unconditionally

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Matan Breizman <Matan.Brz@gmail.com>
4 weeks agomgr/cephadm: update tests to match changes to smb image names
John Mulligan [Tue, 19 Aug 2025 18:47:52 +0000 (14:47 -0400)]
mgr/cephadm: update tests to match changes to smb image names

Signed-off-by: John Mulligan <jmulligan@redhat.com>
4 weeks agotentacle: python-common/cephadm: use ceph20- prefixed images
John Mulligan [Tue, 12 Aug 2025 18:26:36 +0000 (14:26 -0400)]
tentacle: python-common/cephadm: use ceph20- prefixed images

The samba-containers project is now producing images that are based on
samba + ceph tentacle packages (for libcephfs, etc). Use that as the
image used for the samba server.

Same for samba-metrics.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
4 weeks agoMerge pull request #64794 from aainscow/wip-72363-tentacle
SrinivasaBharathKanta [Tue, 19 Aug 2025 14:52:31 +0000 (20:22 +0530)]
Merge pull request #64794 from aainscow/wip-72363-tentacle

tentacle: osd: Remove all references to hinfo from optimized EC

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Sun, 10 Aug 2025 10:38:33 +0000 (20:38 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "ceph-fuse" in the file doc/cephfs/troubleshooting.rst.

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

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Thu, 14 Aug 2025 05:20:53 +0000 (15:20 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "In-memory log dumps" in
doc/cephfs/troubleshooting.rst.

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

fixup

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

4 weeks agoMerge pull request #65076 from zdover23/wip-doc-2025-08-18-backport-64939-to-tentacle
Zac Dover [Tue, 19 Aug 2025 08:39:06 +0000 (18:39 +1000)]
Merge pull request #65076 from zdover23/wip-doc-2025-08-18-backport-64939-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65081 from zdover23/wip-doc-2025-08-18-backport-65051-to-tentacle
Zac Dover [Tue, 19 Aug 2025 08:38:34 +0000 (18:38 +1000)]
Merge pull request #65081 from zdover23/wip-doc-2025-08-18-backport-65051-to-tentacle

tentacle: doc/cephfs: Update quota.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65086 from zdover23/wip-doc-2025-08-18-backport-64921-to-tentacle
Zac Dover [Tue, 19 Aug 2025 08:38:08 +0000 (18:38 +1000)]
Merge pull request #65086 from zdover23/wip-doc-2025-08-18-backport-64921-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65089 from zdover23/wip-doc-2025-08-18-backport-64928-to-tentacle
Zac Dover [Tue, 19 Aug 2025 08:32:50 +0000 (18:32 +1000)]
Merge pull request #65089 from zdover23/wip-doc-2025-08-18-backport-64928-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65095 from zdover23/wip-doc-2025-08-18-backport-64940-to-tentacle
Zac Dover [Tue, 19 Aug 2025 08:31:05 +0000 (18:31 +1000)]
Merge pull request #65095 from zdover23/wip-doc-2025-08-18-backport-64940-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoprometheus: Add OSD full and nearfull ratio to prometheus
Ankush Behl [Thu, 7 Aug 2025 11:43:19 +0000 (17:13 +0530)]
prometheus: Add OSD full and nearfull ratio to prometheus

Fixes: https://tracker.ceph.com/issues/72495
Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
(cherry picked from commit 0a8fb009c4fe29326ccc6b694ea608445f518550)

4 weeks agoMerge pull request #65073 from baum/72509_backport
baum [Tue, 19 Aug 2025 06:51:14 +0000 (09:51 +0300)]
Merge pull request #65073 from baum/72509_backport

src/nvmeof/NVMeofGwMonitorClient: connect panic

Backport #64713
Tracker https://tracker.ceph.com/issues/72509

4 weeks agomgr/dashboard: close token status subscription properly
Nizamudeen A [Tue, 12 Aug 2025 04:15:54 +0000 (09:45 +0530)]
mgr/dashboard: close token status subscription properly

Since its not returning any subscription back to the `this.subs`
property, those subscriptions are not properly closed in the
workbench-layout when its destroyed. So ensuring proper return

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

4 weeks agomgr/dashboard: loading state for inventory card
Nizamudeen A [Wed, 6 Aug 2025 09:23:22 +0000 (14:53 +0530)]
mgr/dashboard: loading state for inventory card

show loading state when inventory details are being loaded. also don't
block the UI when inventories are not loaded.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.html
 - resolve conflicts from popover changes
src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html
 - resolve conflicts from the icon changes
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
 - only import inline loading component

4 weeks agomgr/dashboard: fix memory leak in prometheus service
Nizamudeen A [Fri, 8 Aug 2025 06:42:20 +0000 (12:12 +0530)]
mgr/dashboard: fix memory leak in prometheus service

Prometheus API calls in the Cluster Utilization call is subscribed in
the for loop multiple times but this is not properly unsubscribed. As we
stay in the dashboard page for longer time, it produces a significant
memory leak which eventually lags the UI. Attempting to fix it by
properly handling the subscription

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

4 weeks agomgr/dashboard: fix table dom re-rendering
Nizamudeen A [Mon, 28 Jul 2025 08:22:36 +0000 (13:52 +0530)]
mgr/dashboard: fix table dom re-rendering

each table refresh creates a new data or update the existing data. this
causes the existing data to be completely replaced with a newer one and
thereby loosing the trackBy functionality. So I am modifying the data
in-place so that the memory reference doesn't get changed

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

4 weeks agomgr/dashboard: fix table loading while fetching data
Nizamudeen A [Wed, 23 Jul 2025 11:09:46 +0000 (16:39 +0530)]
mgr/dashboard: fix table loading while fetching data

don't stop loading until all the data is properly fetched

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

4 weeks agodebian/control: install libnuma-dev unconditionally
Dan Mick [Mon, 18 Aug 2025 19:15:42 +0000 (12:15 -0700)]
debian/control: install libnuma-dev unconditionally

The arm64-only module uadk needs numa.h to build; nothing else
ensures it's available.  Make it an unconditional ceph build
dependency on behalf of the arm64 build.

Fixes: https://tracker.ceph.com/issues/72594
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit fa6c38c1d04f6f6e4529aae5c7bf815f621ba8b4)

4 weeks agomgr/dashboard: add tab structure to File Systems page and embed Ceph-Filesystem Overv...
Abhishek Desai [Wed, 9 Jul 2025 08:09:50 +0000 (13:39 +0530)]
mgr/dashboard: add tab structure to File Systems page and embed Ceph-Filesystem Overview dashboard
fixes: https://tracker.ceph.com/issues/72039
Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 993f945c2c466c27c042fc4fbae610a53d6f94c7)

4 weeks agoMerge pull request #64670 from cbodley/wip-72257-tentacle
Yuri Weinstein [Mon, 18 Aug 2025 17:44:08 +0000 (10:44 -0700)]
Merge pull request #64670 from cbodley/wip-72257-tentacle

tentacle: qa/rgw: remove hadoop-s3a subsuite

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 weeks agoMerge pull request #64740 from VinayBhaskar-V/wip-72320-tentacle
Yuri Weinstein [Mon, 18 Aug 2025 17:43:02 +0000 (10:43 -0700)]
Merge pull request #64740 from VinayBhaskar-V/wip-72320-tentacle

tentacle: rbd-mirror: prevent image deletion if remote image is not primary

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Mon, 11 Aug 2025 04:55:00 +0000 (14:55 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "Disconnected+Remounted FS" in the file
doc/cephfs/troubleshooting.rst.

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

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Sun, 10 Aug 2025 11:04:44 +0000 (21:04 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "Kernel Mount Debugging" in the file
doc/cephfs/troubleshooting.rst.

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

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Sun, 10 Aug 2025 08:32:03 +0000 (18:32 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "The MDS" in the file doc/cephfs/troubleshooting.rst.

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

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Sat, 9 Aug 2025 00:25:31 +0000 (10:25 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "Slow Requests (MDS)" in
doc/cephfs/troubleshooting.rst.

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

4 weeks agoMerge pull request #64875 from rhcs-dashboard/wip-72449-tentacle
afreen23 [Mon, 18 Aug 2025 12:09:10 +0000 (17:39 +0530)]
Merge pull request #64875 from rhcs-dashboard/wip-72449-tentacle

tentacle: mgr/dashboard: Fixed incorrect snapshot scheduled date for rbd block in GUI

Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 weeks agoMerge pull request #65045 from zdover23/wip-doc-2024-08-14-backport-64981-to-tentacle
Zac Dover [Mon, 18 Aug 2025 09:12:16 +0000 (19:12 +1000)]
Merge pull request #65045 from zdover23/wip-doc-2024-08-14-backport-64981-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65042 from zdover23/wip-doc-2024-08-14-backport-64930-to-tentacle
Zac Dover [Mon, 18 Aug 2025 09:11:30 +0000 (19:11 +1000)]
Merge pull request #65042 from zdover23/wip-doc-2024-08-14-backport-64930-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65039 from zdover23/wip-doc-2025-08-14-backport-64923-to-tentacle
Zac Dover [Mon, 18 Aug 2025 09:09:25 +0000 (19:09 +1000)]
Merge pull request #65039 from zdover23/wip-doc-2025-08-14-backport-64923-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #65035 from zdover23/wip-doc-2025-08-14-backport-64922-to-tentacle
Zac Dover [Mon, 18 Aug 2025 09:02:03 +0000 (19:02 +1000)]
Merge pull request #65035 from zdover23/wip-doc-2025-08-14-backport-64922-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agoMerge pull request #64883 from rhcs-dashboard/wip-72460-tentacle
afreen23 [Mon, 18 Aug 2025 09:00:45 +0000 (14:30 +0530)]
Merge pull request #64883 from rhcs-dashboard/wip-72460-tentacle

tentacle: mgr/dashboard: 72409 : Fixed parsing error in grafana for host overall performance iframe

Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 weeks agoMerge pull request #65024 from zdover23/wip-doc-2025-08-14-backport-64982-to-tentacle
Zac Dover [Mon, 18 Aug 2025 08:59:47 +0000 (18:59 +1000)]
Merge pull request #65024 from zdover23/wip-doc-2025-08-14-backport-64982-to-tentacle

tentacle: doc/cephfs: edit troubleshooting.rst

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 weeks agodoc/cephfs: Update quota.rst
Jannis Speer [Thu, 14 Aug 2025 16:49:48 +0000 (18:49 +0200)]
doc/cephfs: Update quota.rst

Make the user aware to adapt the client capabilities to enable the configuration of quotas.

Signed-off-by: Jannis Speer <Jannis.speer@tutanota.com>
doc/cephfs: fix broken link

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

4 weeks agodoc/cephfs: edit troubleshooting.rst
Zac Dover [Mon, 11 Aug 2025 04:30:22 +0000 (14:30 +1000)]
doc/cephfs: edit troubleshooting.rst

Edit the section "Slow requests" in the file
doc/cephfs/troubleshooting.rst.

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

4 weeks agoMerge pull request #65056 from zdover23/wip-doc-2025-08-15-backport-64787-to-tentacle
Zac Dover [Mon, 18 Aug 2025 06:23:39 +0000 (16:23 +1000)]
Merge pull request #65056 from zdover23/wip-doc-2025-08-15-backport-64787-to-tentacle

tentacle: doc/cephfs: add a note about estimated replay completion time

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
5 weeks agonvmeof: create /dev/dsa if DSA acceleration is enabled and the device doesn't exist
Alexander Indenbaum [Thu, 31 Jul 2025 15:33:36 +0000 (18:33 +0300)]
nvmeof: create /dev/dsa if DSA acceleration is enabled and the device doesn't exist

Tracker: https://tracker.ceph.com/issues/72508

Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>
(cherry picked from commit 93ec459ab784b8a3818a9ca50d67f1e9f8a497b7)

5 weeks agosrc/nvmeof/NVMeofGwMonitorClient: connect panic
Alexander Indenbaum [Mon, 7 Jul 2025 07:42:37 +0000 (10:42 +0300)]
src/nvmeof/NVMeofGwMonitorClient: connect panic

- add NVMe-oF Monitor Client configuration reference

Tracker: https://tracker.ceph.com/issues/72509

Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>
(cherry picked from commit babd3c00341c59cb82e66f93f41c687ab4fc6928)

5 weeks agoMerge pull request #65003 from Hezko/wip-72560-tentacle
afreen23 [Sat, 16 Aug 2025 08:39:41 +0000 (14:09 +0530)]
Merge pull request #65003 from Hezko/wip-72560-tentacle

tentacle: mgr/dashboard: fix nvmeof mtls

Reviewed-by: Nizamudeen A <nia@redhat.com>
5 weeks agoMerge pull request #64697 from adk3798/tentacle-smb-ip-bind
Adam King [Fri, 15 Aug 2025 16:06:37 +0000 (12:06 -0400)]
Merge pull request #64697 from adk3798/tentacle-smb-ip-bind

tentacle: smb: support custom ip address binds

Reviewed-by: John Mulligan <jmulligan@redhat.com>
5 weeks agolibcephfs_proxy: optimize ceph_chdir/ceph_getcwd
Xavi Hernandez [Sun, 27 Jul 2025 20:48:09 +0000 (22:48 +0200)]
libcephfs_proxy: optimize ceph_chdir/ceph_getcwd

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit 422abb7b69bdcf6ee2c32bac9b804b8e0577698e)

5 weeks agolibcephfs_proxy: enable the embedded perms feature
Xavi Hernandez [Sat, 26 Jul 2025 19:43:24 +0000 (21:43 +0200)]
libcephfs_proxy: enable the embedded perms feature

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit 579ca2369b19e56b9c77d08194eb62d462ba30f0)

5 weeks agolibcephfs_proxy: check requirements for embedded perms on connection
Xavi Hernandez [Sat, 26 Jul 2025 19:41:22 +0000 (21:41 +0200)]
libcephfs_proxy: check requirements for embedded perms on connection

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit 594c53be8a6f108cf644d80f7087fbf40aff777c)

5 weeks agolibcephfs_proxy: implement client side support for embedded perms
Xavi Hernandez [Sat, 26 Jul 2025 19:33:55 +0000 (21:33 +0200)]
libcephfs_proxy: implement client side support for embedded perms

Implement the code to handle embedded perms or not depending on a
feature flag negotiated during connection.

If embedded permissions are enabled, ceph_userperm_new() will allocate a
local structure with the provided credentials instead of sending it to
the server. ceph_userperm_destroy() will just destroy the allocated
structure. If it's disabled, these function will work as any other
function, sending the request to the server.

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit 68505c3e3a3f7c00bcc6a0b2e90932bf52d09575)

5 weeks agolibcephfs_proxy: extend the protocol to support embedded permissions
Xavi Hernandez [Sat, 26 Jul 2025 18:13:38 +0000 (20:13 +0200)]
libcephfs_proxy: extend the protocol to support embedded permissions

This patch adds the changes to the protocol definition to support
sending the user credentials along with the request that requires it.

Using protocol version 1, instead of sending a pointer to a previously
allocated UserPerm structure, the caller will embed the uid, gid and the
list of additional groups in the request itself.

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit cde17574cf4c0e81e7eeab9874d1f319fdf4d89a)

5 weeks agolibcephfs_proxy: add protocol version negotiation
Xavi Hernandez [Sat, 26 Jul 2025 18:10:42 +0000 (20:10 +0200)]
libcephfs_proxy: add protocol version negotiation

A new negotiation option has been introduced which will be used to
decide which protocol version to use between client and server.

Signed-off-by: Xavi Hernandez <xhernandez@gmail.com>
(cherry picked from commit 52fba7af44cb19be77bc28b9b95d52c78121c19b)