Attachment 224823 Details for Bug 255763 – git diff of the upgrade to 14.2.20

[patch] git diff of the upgrade to 14.2.20

ceph14.2.20.diff (text/plain), 13.94 KB, created by Willem Jan Withagen on 2021-05-10 22:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2021-05-10 22:25:18 UTC

Size: 13.94 KB

patch

obsolete

>diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
>index 0b3fba537..53dd2433b 100644
>--- a/net/ceph14/Makefile
>+++ b/net/ceph14/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	14.2.11
>-PORTREVISION=	3
>+DISTVERSION=	14.2.20
> CATEGORIES=	net
> PKGNAMESUFFIX=	14
> 
>@@ -40,6 +39,7 @@ LIB_DEPENDS=	\
> 	libtcmalloc.so:devel/google-perftools \
> 	librabbitmq.so:net/rabbitmq-c \
> 	libfmt.so:devel/libfmt
>+
> RUN_DEPENDS=	\
> 	bash:shells/bash \
> 	flock:sysutils/flock \
>@@ -86,11 +86,12 @@ GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
> GH_TUPLE+=	ceph:rocksdb:4c736f1:rocksdb/src/rocksdb
> GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
> GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
>-# GH_TUPLE+=	ceph:seastar:0cf6aa6:seastar/src/seastar
>+GH_TUPLE+=	ceph:spawn:5f4742f:spawn/src/spawn
>+
> 
> 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 \
>+CMAKE_OFF=	WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_LEVELDB \
> 		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \
> 		WITH_RADOSGW_KAFKA_ENDPOINT
> CMAKE_ARGS=	-D MGR_PYTHON_VERSION=${PYTHON_VER} \
>diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo
>index 47485b096..90da0d3f7 100644
>--- a/net/ceph14/distinfo
>+++ b/net/ceph14/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1597409334
>-SHA256 (ceph-ceph-v14.2.11_GH0.tar.gz) = 45470f70befab52dbf143224e3e9bfc90870369ae9413677e79f387863e76a80
>-SIZE (ceph-ceph-v14.2.11_GH0.tar.gz) = 21948721
>+TIMESTAMP = 1620681881
>+SHA256 (ceph-ceph-v14.2.20_GH0.tar.gz) = 738c61ca57c02f26c7239137ab94b176308e169264da131f586e5f04602f0cb9
>+SIZE (ceph-ceph-v14.2.20_GH0.tar.gz) = 21950532
> 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
>@@ -27,7 +27,7 @@ SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08
> SIZE (ceph-rocksdb-4c736f1_GH0.tar.gz) = 5468514
> SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
> SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
>+SHA256 (ceph-spawn-5f4742f_GH0.tar.gz) = c8832724cf3dd873db7c10407404b6cef30fa770902ab446f830902fed21603a
>+SIZE (ceph-spawn-5f4742f_GH0.tar.gz) = 7319
> SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
> SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022
>-SHA256 (ceph-seastar-0cf6aa6_GH0.tar.gz) = 2772b32fbcb0f26c6d1cf07c1fcb9bfef7cdd2fdc41ec21af142d6cb3ff08f38
>-SIZE (ceph-seastar-0cf6aa6_GH0.tar.gz) = 896598
>diff --git a/net/ceph14/files/file-git_version b/net/ceph14/files/file-git_version
>index b351307c5..5d14a0227 100644
>--- a/net/ceph14/files/file-git_version
>+++ b/net/ceph14/files/file-git_version
>@@ -1,2 +1,3 @@
>-f7fdb2f52131f54b891a2ec99d8205561242cdaf
>-v14.2.11
>+38eee5b1f08120de4e54fb6a842145c71bd17d23
>+v14.2.20-212-g38eee5b1f0
>+
>diff --git a/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff b/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff
>deleted file mode 100644
>index c69145759..000000000
>--- a/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
>-index 44609741ed..ebbbd12c01 100644
>---- src/rgw/rgw_main.cc
>-+++ src/rgw/rgw_main.cc
>-@@ -565,8 +565,8 @@ int main(int argc, const char **argv)
>-   // add a watcher to respond to realm configuration changes
>-   RGWPeriodPusher pusher(store);
>-   RGWFrontendPauser pauser(fes, implicit_tenant_context, &pusher);
>--  std::optional<RGWRealmReloader> reloader(std::in_place, store,
>--                                           service_map_meta, &pauser);
>-+  auto reloader = std::make_unique<RGWRealmReloader>(store,
>-+                                                    service_map_meta, &pauser);
>- 
>-   RGWRealmWatcher realm_watcher(g_ceph_context, store->svc.zone->get_realm());
>-   realm_watcher.add_watcher(RGWRealmNotify::Reload, *reloader);
>diff --git a/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc b/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc
>deleted file mode 100644
>index 32824ac25..000000000
>--- a/net/ceph14/files/patch-src_test_libcephfs_lazyio.cc
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- 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;
>- 
>diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message
>index 12b648acd..e590eda16 100644
>--- a/net/ceph14/pkg-message
>+++ b/net/ceph14/pkg-message
>@@ -6,13 +6,11 @@ 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
>+    sudo pkg install npm-node14
>     cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
>-    chown -R ceph .
>-    ls -asl /var/lib/ceph
>-    chown -R ceph:ceph /var/lib/ceph
>     sudo -u ceph npm ci
>+    sudo chown -R ceph:ceph .
>+    sudo chown -R ceph:ceph /var/lib/ceph
> 
> EOM
> }
>diff --git a/net/ceph14/pkg-plist b/net/ceph14/pkg-plist
>index f3366b909..263e542c5 100644
>--- a/net/ceph14/pkg-plist
>+++ b/net/ceph14/pkg-plist
>@@ -94,21 +94,21 @@ lib/ceph/compressor/libceph_zlib.so.2.0.0
> lib/ceph/compressor/libceph_zstd.so
> lib/ceph/compressor/libceph_zstd.so.2
> lib/ceph/compressor/libceph_zstd.so.2.0.0
>-%%NO_AMD64%%lib/ceph/crypto/libceph_crypto_isal.so
>-%%NO_AMD64%%lib/ceph/crypto/libceph_crypto_isal.so.1
>-%%NO_AMD64%%lib/ceph/crypto/libceph_crypto_isal.so.1.0.0
>+lib/ceph/crypto/libceph_crypto_isal.so
>+lib/ceph/crypto/libceph_crypto_isal.so.1
>+lib/ceph/crypto/libceph_crypto_isal.so.1.0.0
> lib/ceph/crypto/libceph_crypto_openssl.so
> lib/ceph/erasure-code/libec_clay.so
>-%%NO_AMD64%%lib/ceph/erasure-code/libec_isa.so
>+lib/ceph/erasure-code/libec_isa.so
> lib/ceph/erasure-code/libec_jerasure.so
> lib/ceph/erasure-code/libec_jerasure_generic.so
>-%%NO_AMD64%%lib/ceph/erasure-code/libec_jerasure_sse3.so
>-%%NO_AMD64%%lib/ceph/erasure-code/libec_jerasure_sse4.so
>+lib/ceph/erasure-code/libec_jerasure_sse3.so
>+lib/ceph/erasure-code/libec_jerasure_sse4.so
> lib/ceph/erasure-code/libec_lrc.so
> lib/ceph/erasure-code/libec_shec.so
> lib/ceph/erasure-code/libec_shec_generic.so
>-%%NO_AMD64%%lib/ceph/erasure-code/libec_shec_sse3.so
>-%%NO_AMD64%%lib/ceph/erasure-code/libec_shec_sse4.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
>@@ -173,16 +173,6 @@ lib/librgw_admin_user.so.1.0.0
> %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/listing.py
> %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/main.py
> %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/prepare.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__init__.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/bluestore.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/filestore.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/strategies.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/validators.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/bluestore.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/filestore.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/strategies.py
>-%%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
>@@ -239,22 +229,16 @@ lib/librgw_admin_user.so.1.0.0
> %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
> %%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_common.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
> %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_zap.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__init__.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_bluestore.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_filestore.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_validate.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
>-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_validate.py
> %%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_common.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
>@@ -1152,6 +1136,10 @@ sbin/mount.fuse.ceph
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/dimless-binary.directive.spec.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/dimless-binary.directive.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/directives.module.ts
>+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts
>+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.ts
>+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/form-scope.directive.spec.ts
>+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/form-scope.directive.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/iops.directive.spec.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/iops.directive.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/directives/milliseconds.directive.spec.ts
>@@ -1308,7 +1296,6 @@ sbin/mount.fuse.ceph
> %%DATADIR%%/mgr/dashboard/frontend/src/jestGlobalMocks.ts
> %%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.cs.xlf
> %%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.de-DE.xlf
>-%%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.en-US.xlf
> %%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.es-ES.xlf
> %%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.fr-FR.xlf
> %%DATADIR%%/mgr/dashboard/frontend/src/locale/messages.id-ID.xlf
>@@ -1377,6 +1364,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_auth.py
> %%DATADIR%%/mgr/dashboard/tests/test_ceph_service.py
> %%DATADIR%%/mgr/dashboard/tests/test_cephfs.py
> %%DATADIR%%/mgr/dashboard/tests/test_controllers.py
>@@ -1423,6 +1411,7 @@ sbin/mount.fuse.ceph
> %%DATADIR%%/mgr/diskprediction_cloud/agent/metrics/sai_host.py
> %%DATADIR%%/mgr/diskprediction_cloud/agent/predictor.py
> %%DATADIR%%/mgr/diskprediction_cloud/common/__init__.py
>+%%DATADIR%%/mgr/diskprediction_cloud/common/__init__.py.orig
> %%DATADIR%%/mgr/diskprediction_cloud/common/client_pb2.py
> %%DATADIR%%/mgr/diskprediction_cloud/common/client_pb2_grpc.py
> %%DATADIR%%/mgr/diskprediction_cloud/common/clusterdata.py
>@@ -1591,20 +1580,25 @@ sbin/mount.fuse.ceph
> %%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/access.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/rankevicter.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/auth_metadata.py
> %%DATADIR%%/mgr/volumes/fs/operations/versions/metadata_manager.py
>+%%DATADIR%%/mgr/volumes/fs/operations/versions/op_sm.py
>+%%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_attrs.py
> %%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_base.py
> %%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_v1.py
>+%%DATADIR%%/mgr/volumes/fs/operations/versions/subvolume_v2.py
> %%DATADIR%%/mgr/volumes/fs/operations/volume.py
> %%DATADIR%%/mgr/volumes/fs/purge_queue.py
> %%DATADIR%%/mgr/volumes/fs/vol_spec.py

Actions: View | Diff

Attachments on bug 255763: 224823 | 224843