net/ceph14: Update to 14.2.8, enable libcephfs to be built

PR:		244675
Submitted by:	fluffy, Willem Jan Withagen (based on)
Approved by:	Willem Jan Withagen (maintainer)
Relnotes:	https://ceph.io/releases/v14-2-8-nautilus-released/
This commit is contained in:
Dima Panov 2020-04-27 18:29:20 +00:00
parent 542dc8908a
commit 563f1f874e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=533161
9 changed files with 140 additions and 87 deletions

View file

@ -3,8 +3,8 @@
PORTNAME= ceph
DISTVERSIONPREFIX= v
DISTVERSION= 14.2.7
PORTREVISION= 1
DISTVERSION= 14.2.8
PORTREVISION= 0
CATEGORIES= net
PKGNAMESUFFIX= 14
@ -44,9 +44,9 @@ RUN_DEPENDS= \
bash:shells/bash \
flock:sysutils/flock \
jq:textproc/jq \
smartctl:sysutils/smartmontools \
xml:textproc/xmlstarlet \
${LOCALBASE}/bin/getopt:misc/getopt \
${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \
${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
@ -64,7 +64,7 @@ RUN_DEPENDS= \
USES= cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
pkgconfig python:3.7+ shebangfix ssl
USE_PYTHON= cython
USE_PYTHON= cython py3kplist
USE_OPENLDAP= yes
USE_GITHUB= yes
GH_ACCOUNT= ceph:DEFAULT
@ -91,9 +91,7 @@ GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd
CMAKE_BUILD_TYPE= Release
CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
WITH_SPDK WITH_RDMA WITH_RADOSGW_BEAST_FRONTEND \
WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \
WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2
WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2
CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \
-D CEPH_MAN_DIR:STRING=man
@ -112,6 +110,8 @@ PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b
pre-configure:
[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
${CP} files/file-git_version ${WRKSRC}/src/.git_version
# Use the module finders that come with Cmake for Boost and Python
${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true
post-install:
# To install a ceph.conf sample

View file

@ -1,6 +1,6 @@
TIMESTAMP = 1581605576
SHA256 (ceph-ceph-v14.2.7_GH0.tar.gz) = f2882424ecce6fa3a6bf5bdbdc01fc3dae885d9f2ccb40c50ead859eeba69126
SIZE (ceph-ceph-v14.2.7_GH0.tar.gz) = 21217939
TIMESTAMP = 1586673911
SHA256 (ceph-ceph-v14.2.8_GH0.tar.gz) = 313e7e17f898ffde8b85093541e6e9a1fb3515456f95404d67133e60d305f370
SIZE (ceph-ceph-v14.2.8_GH0.tar.gz) = 21358433
SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214

View file

@ -1,2 +1,3 @@
6036662bc04e4d9a0f8ab284b1a18ca54100c1d7
v14.2.7-508-g6036662bc0
2d095e947a02261ce61424021bb43bd3022d35cb
v14.2.8

View file

@ -1,36 +1,32 @@
git diff src/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60e261b10e..287ecc6600 100644
*** src/CMakeLists.txt.org 2019-09-27 10:19:32.501849000 +0200
--- src/CMakeLists.txt 2019-09-27 10:18:05.318965000 +0200
***************
*** 58,63 ****
--- 58,68 ----
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register")
+ if(FREEBSD)
+ # Need to use the GNU binutils linker to get versioning right.
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
+ endif()
if(APPLE)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
endif()
***************
*** 516,522 ****
INSTALL_RPATH "")
install(TARGETS ceph-osd DESTINATION bin)
! if (WITH_CEPHFS)
add_subdirectory(mds)
set(ceph_mds_srcs
ceph_mds.cc)
--- 521,527 ----
INSTALL_RPATH "")
install(TARGETS ceph-osd DESTINATION bin)
! if (WITH_CEPHFS OR FREEBSD)
add_subdirectory(mds)
set(ceph_mds_srcs
ceph_mds.cc)
--- src/CMakeLists.txt.orig 2020-01-31 17:07:52 UTC
+++ src/CMakeLists.txt
@@ -58,6 +58,11 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register")
+ if(FREEBSD)
+ # Need to use the GNU binutils linker to get versioning right.
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument")
+ endif()
if(APPLE)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
endif()
@@ -516,7 +521,7 @@ set_target_properties(ceph-osd PROPERTIES
INSTALL_RPATH "")
install(TARGETS ceph-osd DESTINATION bin)
-if (WITH_CEPHFS)
+if (WITH_CEPHFS OR FREEBSD)
add_subdirectory(mds)
set(ceph_mds_srcs
ceph_mds.cc)
@@ -625,8 +630,6 @@ add_subdirectory(bash_completion)
add_subdirectory(client)
if(WITH_LIBCEPHFS)
- find_package(PkgConfig QUIET REQUIRED)
- pkg_check_modules(CAPNG REQUIRED libcap-ng)
set(libcephfs_srcs libcephfs.cc)
add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
target_link_libraries(cephfs PRIVATE client ceph-common

View file

@ -1,21 +0,0 @@
diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
index f6269dbef6ac..00048b4a7af0 100644
--- src/rgw/rgw_iam_policy.h
+++ src/rgw/rgw_iam_policy.h
@@ -9,7 +9,6 @@
#include <cstdint>
#include <iostream>
#include <string>
-#include <bitset>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/container/flat_map.hpp>
@@ -125,7 +124,7 @@ static constexpr std::uint64_t stsAll = 79;
static constexpr std::uint64_t s3Count = s3BypassGovernanceRetention + 1;
static constexpr std::uint64_t allCount = stsAll + 1;
-using Action_t = bitset<allCount>;
+using Action_t = std::bitset<allCount>;
using NotAction_t = Action_t;
static const Action_t None(0);

View file

@ -1,13 +0,0 @@
diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h
index 82047d24e5..9a210292b2 100644
--- src/rgw/rgw_rest_conn.h
+++ src/rgw/rgw_rest_conn.h
@@ -438,7 +438,7 @@ public:
int wait(T *dest, E *err_result = nullptr);
};
-template <class T, class E=int>
+template <class T, class E>
int RGWRESTSendResource::wait(T *dest, E *err_result)
{
int ret = req.wait();

View file

@ -0,0 +1,15 @@
--- src/test/libcephfs/lazyio.cc.orig 2020-03-02 17:49:20 UTC
+++ src/test/libcephfs/lazyio.cc
@@ -21,7 +21,12 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
+#ifdef __linux__
#include <sys/xattr.h>
+#endif
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#endif
rados_t cluster;

View file

@ -6,8 +6,9 @@ It comes with a web based dashboard that cannot be build
into a package but will require the user to install it himself.
To install the dashboard, please execute:
sudo pkg install python2
sudo pkg install npm
cd /usr/local/share/ceph/mgr/dashboard/frontend
cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
chown -R ceph .
ls -asl /var/lib/ceph
chown -R ceph:ceph /var/lib/ceph

View file

@ -1,6 +1,7 @@
bin/ceph
bin/ceph-authtool
bin/ceph-bluestore-tool
bin/ceph-client-debug
bin/ceph-clsinfo
bin/ceph-conf
bin/ceph-coverage
@ -16,12 +17,13 @@ bin/ceph-monstore-tool
bin/ceph-objectstore-tool
bin/ceph-osd
bin/ceph-osdomap-tool
bin/ceph_kvstorebench
bin/ceph-post-file
bin/ceph-rbdnamer
bin/ceph-run
bin/ceph-syn
bin/ceph_erasure_code
bin/ceph_erasure_code_benchmark
bin/ceph_kvstorebench
bin/ceph_objectstore_bench
bin/ceph_omapbench
bin/ceph_radosacl
@ -29,6 +31,9 @@ bin/ceph_rgw_jsonparser
bin/ceph_rgw_multiparser
bin/ceph_scratchtool
bin/cephdeduptool
bin/cephfs-data-scan
bin/cephfs-journal-tool
bin/cephfs-table-tool
bin/crushtool
bin/init-ceph
bin/librados-config
@ -53,6 +58,8 @@ etc/bash_completion.d/radosgw-admin
etc/bash_completion.d/rbd
%%ETCDIR%%/ceph.conf.sample
etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf
include/cephfs/ceph_statx.h
include/cephfs/libcephfs.h
include/rados/buffer.h
include/rados/buffer_fwd.h
include/rados/crc32c.h
@ -101,6 +108,9 @@ lib/ceph/erasure-code/libec_shec_generic.so
lib/ceph/erasure-code/libec_shec_sse3.so
lib/ceph/erasure-code/libec_shec_sse4.so
lib/ceph/libceph-common.so.0
lib/libcephfs.so
lib/libcephfs.so.2
lib/libcephfs.so.2.0.0
lib/librados.so
lib/librados.so.2
lib/librados.so.2.0.0
@ -147,6 +157,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/batch.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/create.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/deactivate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/listing.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc
@ -156,6 +167,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/batch.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/common.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/create.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/deactivate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/listing.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/main.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/prepare.py
@ -171,6 +183,18 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/validators.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/trigger.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/zap.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__init__.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/activate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/list.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/activate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/common.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/list.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/main.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/raw/prepare.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__init__.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/activate.cpython-%%PYTHON_SUFFIX%%.pyc
@ -214,6 +238,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_activate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_batch.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_create.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_deactivate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_listing.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_trigger.cpython-%%PYTHON_SUFFIX%%.pyc
@ -229,6 +254,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_activate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_batch.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_create.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_deactivate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_listing.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_prepare.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_trigger.py
@ -259,6 +285,21 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/util/system.py
%%PYTHON_SITELIBDIR%%/ceph_volume/util/templates.py
%%PYTHON_SITELIBDIR%%/ceph_volume_client.py
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/entry_points.txt
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs-0.1.0-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs/__init__.py
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs/__pycache__/zfs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume_zfs/zfs.py
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/cephfs.so
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
@ -277,6 +318,9 @@ lib/librgw_admin_user.so.1.0.0
lib/rados-classes/libcls_cas.so
lib/rados-classes/libcls_cas.so.1
lib/rados-classes/libcls_cas.so.1.0.0
lib/rados-classes/libcls_cephfs.so
lib/rados-classes/libcls_cephfs.so.1
lib/rados-classes/libcls_cephfs.so.1.0.0
lib/rados-classes/libcls_hello.so
lib/rados-classes/libcls_hello.so.1
lib/rados-classes/libcls_hello.so.1.0.0
@ -366,6 +410,8 @@ sbin/mount.fuse.ceph
%%DATADIR%%/id_rsa_drop.ceph.com
%%DATADIR%%/id_rsa_drop.ceph.com.pub
%%DATADIR%%/known_hosts_drop.ceph.com
%%DATADIR%%/mgr/alerts/__init__.py
%%DATADIR%%/mgr/alerts/module.py
%%DATADIR%%/mgr/ansible/__init__.py
%%DATADIR%%/mgr/ansible/ansible_runner_svc.py
%%DATADIR%%/mgr/ansible/module.py
@ -388,6 +434,8 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/README.rst
%%DATADIR%%/mgr/dashboard/__init__.py
%%DATADIR%%/mgr/dashboard/awsauth.py
%%DATADIR%%/mgr/dashboard/cherrypy_backports.py
%%DATADIR%%/mgr/dashboard/ci/check_grafana_uids.py
%%DATADIR%%/mgr/dashboard/controllers/__init__.py
%%DATADIR%%/mgr/dashboard/controllers/auth.py
%%DATADIR%%/mgr/dashboard/controllers/cephfs.py
@ -791,6 +839,7 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/pool/pool-stat.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/pool/pool.module.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/pool/pool.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-user-capabilities.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-user-capability.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-user-s3-key.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-user-subuser.ts
@ -895,7 +944,6 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.scss
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/mgr-modules/telemetry/telemetry.component.html
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.scss
%%DATADIR%%/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts
@ -1099,6 +1147,8 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/milliseconds.directive.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/password-button.directive.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/enum/components.enum.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts
@ -1166,6 +1216,8 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/milliseconds.pipe.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/milliseconds.pipe.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/not-available.pipe.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/not-available.pipe.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/ordinal.pipe.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/ordinal.pipe.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts
@ -1271,10 +1323,12 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/grafana.py
%%DATADIR%%/mgr/dashboard/module.py
%%DATADIR%%/mgr/dashboard/plugins/__init__.py
%%DATADIR%%/mgr/dashboard/plugins/debug.py
%%DATADIR%%/mgr/dashboard/plugins/feature_toggles.py
%%DATADIR%%/mgr/dashboard/plugins/interfaces.py
%%DATADIR%%/mgr/dashboard/plugins/lru_cache.py
%%DATADIR%%/mgr/dashboard/plugins/pluggy.py
%%DATADIR%%/mgr/dashboard/plugins/plugin.py
%%DATADIR%%/mgr/dashboard/plugins/ttl_cache.py
%%DATADIR%%/mgr/dashboard/requirements-py27.txt
%%DATADIR%%/mgr/dashboard/requirements-py3.txt
@ -1308,6 +1362,7 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/tests/helper.py
%%DATADIR%%/mgr/dashboard/tests/test_access_control.py
%%DATADIR%%/mgr/dashboard/tests/test_api_auditing.py
%%DATADIR%%/mgr/dashboard/tests/test_cephfs.py
%%DATADIR%%/mgr/dashboard/tests/test_controllers.py
%%DATADIR%%/mgr/dashboard/tests/test_docs.py
%%DATADIR%%/mgr/dashboard/tests/test_erasure_code_profile.py
@ -1319,6 +1374,7 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/tests/test_iscsi.py
%%DATADIR%%/mgr/dashboard/tests/test_notification.py
%%DATADIR%%/mgr/dashboard/tests/test_osd.py
%%DATADIR%%/mgr/dashboard/tests/test_plugin_debug.py
%%DATADIR%%/mgr/dashboard/tests/test_pool.py
%%DATADIR%%/mgr/dashboard/tests/test_prometheus.py
%%DATADIR%%/mgr/dashboard/tests/test_rbd_mirroring.py
@ -1513,10 +1569,28 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/test_orchestrator/module.py
%%DATADIR%%/mgr/volumes/__init__.py
%%DATADIR%%/mgr/volumes/fs/__init__.py
%%DATADIR%%/mgr/volumes/fs/async_cloner.py
%%DATADIR%%/mgr/volumes/fs/async_job.py
%%DATADIR%%/mgr/volumes/fs/exception.py
%%DATADIR%%/mgr/volumes/fs/fs_util.py
%%DATADIR%%/mgr/volumes/fs/operations/__init__.py
%%DATADIR%%/mgr/volumes/fs/operations/clone_index.py
%%DATADIR%%/mgr/volumes/fs/operations/group.py
%%DATADIR%%/mgr/volumes/fs/operations/index.py
%%DATADIR%%/mgr/volumes/fs/operations/lock.py
%%DATADIR%%/mgr/volumes/fs/operations/op_sm.py
%%DATADIR%%/mgr/volumes/fs/operations/resolver.py
%%DATADIR%%/mgr/volumes/fs/operations/snapshot_util.py
%%DATADIR%%/mgr/volumes/fs/operations/subvolume.py
%%DATADIR%%/mgr/volumes/fs/operations/template.py
%%DATADIR%%/mgr/volumes/fs/operations/trash.py
%%DATADIR%%/mgr/volumes/fs/operations/versions/__init__.py
%%DATADIR%%/mgr/volumes/fs/operations/versions/metadata_manager.py
%%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_base.py
%%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_v1.py
%%DATADIR%%/mgr/volumes/fs/operations/volume.py
%%DATADIR%%/mgr/volumes/fs/purge_queue.py
%%DATADIR%%/mgr/volumes/fs/subvolspec.py
%%DATADIR%%/mgr/volumes/fs/subvolume.py
%%DATADIR%%/mgr/volumes/fs/vol_spec.py
%%DATADIR%%/mgr/volumes/fs/volume.py
%%DATADIR%%/mgr/volumes/module.py
%%DATADIR%%/mgr/zabbix/__init__.py