Date: Mon, 17 Aug 2020 20:15:50 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545185 - in head/net/ceph14: . files Message-ID: <202008172015.07HKForv032620@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Mon Aug 17 20:15:50 2020 New Revision: 545185 URL: https://svnweb.freebsd.org/changeset/ports/545185 Log: Update to 14.2.11 Release info: We're happy to announce the availability of the eleventh release in the Nautilus series. This release brings a number of bugfixes across all major components of Ceph. We recommend that all Nautilus users upgrade to this release. Notable Changes --------------- * RGW: The `radosgw-admin` sub-commands dealing with orphans -- `radosgw-admin orphans find`, `radosgw-admin orphans finish`, `radosgw-admin orphans list-jobs` -- have been deprecated. They have not been actively maintained and they store intermediate results on the cluster, which could fill a nearly-full cluster. They have been replaced by a tool, currently considered experimental, `rgw-orphan-list`. * Now when noscrub and/or nodeep-scrub flags are set globally or per pool, scheduled scrubs of the type disabled will be aborted. All user initiated scrubs are NOT interrupted. * Fixed a ceph-osd crash in _committed_osd_maps when there is a failure to encode the first incremental map. issue#46443: https://github.com/ceph/ceph/pull/46443 For the detailed changelog please refer to the blog entry at https://ceph.io/releases/v14-2-11-nautilus-released/ PR: 248673 Submitted by: Willem Jan Withagen <wjw@digiware.nl> MFH: 2020Q3 Security: f20eb9a4-dfea-11ea-a9b8-9c5c8e84d621 Added: head/net/ceph14/files/patch-src_msg_async_frames_v2.cc.diff (contents, props changed) head/net/ceph14/files/patch-src_rgw_rgw_lc.cc.diff (contents, props changed) head/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff (contents, props changed) Modified: head/net/ceph14/Makefile head/net/ceph14/distinfo head/net/ceph14/files/file-git_version head/net/ceph14/pkg-plist Modified: head/net/ceph14/Makefile ============================================================================== --- head/net/ceph14/Makefile Mon Aug 17 20:10:04 2020 (r545184) +++ head/net/ceph14/Makefile Mon Aug 17 20:15:50 2020 (r545185) @@ -3,8 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.9 -PORTREVISION= 0 +DISTVERSION= 14.2.11 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -39,7 +38,8 @@ LIB_DEPENDS= \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools \ - librabbitmq.so:net/rabbitmq-c + librabbitmq.so:net/rabbitmq-c \ + libfmt.so:devel/libfmt RUN_DEPENDS= \ bash:shells/bash \ flock:sysutils/flock \ @@ -52,7 +52,6 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ @@ -87,11 +86,13 @@ GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidj 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 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_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 + WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \ + WITH_RADOSGW_KAFKA_ENDPOINT CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \ -D CEPH_MAN_DIR:STRING=man @@ -105,7 +106,7 @@ USE_LDCONFIG= yes USERS= ceph GROUPS= ceph -PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b +# PLIST_SUB=CMAKE_BUILD_TYPE_regex="\bdebug\b" pre-configure: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build Modified: head/net/ceph14/distinfo ============================================================================== --- head/net/ceph14/distinfo Mon Aug 17 20:10:04 2020 (r545184) +++ head/net/ceph14/distinfo Mon Aug 17 20:15:50 2020 (r545185) @@ -1,6 +1,6 @@ -TIMESTAMP = 1588080359 -SHA256 (ceph-ceph-v14.2.9_GH0.tar.gz) = cd3c9a7fe62380a6564cf9534b16c265173ca4120cb743f9c08edf8a2734c7bc -SIZE (ceph-ceph-v14.2.9_GH0.tar.gz) = 21360093 +TIMESTAMP = 1597409334 +SHA256 (ceph-ceph-v14.2.11_GH0.tar.gz) = 45470f70befab52dbf143224e3e9bfc90870369ae9413677e79f387863e76a80 +SIZE (ceph-ceph-v14.2.11_GH0.tar.gz) = 21948721 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 @@ -29,3 +29,5 @@ SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493e SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484 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 Modified: head/net/ceph14/files/file-git_version ============================================================================== --- head/net/ceph14/files/file-git_version Mon Aug 17 20:10:04 2020 (r545184) +++ head/net/ceph14/files/file-git_version Mon Aug 17 20:15:50 2020 (r545185) @@ -1,2 +1,2 @@ -581f22da52345dba46ee232b73b990f06029a2a0 -v14.2.9 +f7fdb2f52131f54b891a2ec99d8205561242cdaf +v14.2.11 Added: head/net/ceph14/files/patch-src_msg_async_frames_v2.cc.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ceph14/files/patch-src_msg_async_frames_v2.cc.diff Mon Aug 17 20:15:50 2020 (r545185) @@ -0,0 +1,13 @@ +diff --git a/src/msg/async/frames_v2.cc b/src/msg/async/frames_v2.cc +index f047eb1846..ecc6c025eb 100644 +--- src/msg/async/frames_v2.cc ++++ src/msg/async/frames_v2.cc +@@ -18,7 +18,7 @@ + + #undef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY 1 +-#include "seastar/fmt/include/fmt/format.h" ++#include "fmt/format.h" + + namespace ceph::msgr::v2 { + Added: head/net/ceph14/files/patch-src_rgw_rgw_lc.cc.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ceph14/files/patch-src_rgw_rgw_lc.cc.diff Mon Aug 17 20:15:50 2020 (r545185) @@ -0,0 +1,13 @@ +diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc +index 9dd29627db..3ea0b70fee 100644 +--- src/rgw/rgw_lc.cc ++++ src/rgw/rgw_lc.cc +@@ -24,7 +24,7 @@ + // prefer header-only fmt, in general + #undef FMT_HEADER_ONLY + #define FMT_HEADER_ONLY 1 +-#include "seastar/fmt/include/fmt/format.h" ++#include "fmt/format.h" + + #include "services/svc_sys_obj.h" + Added: head/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ceph14/files/patch-src_rgw_rgw_main.cc.diff Mon Aug 17 20:15:50 2020 (r545185) @@ -0,0 +1,15 @@ +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); Modified: head/net/ceph14/pkg-plist ============================================================================== --- head/net/ceph14/pkg-plist Mon Aug 17 20:10:04 2020 (r545184) +++ head/net/ceph14/pkg-plist Mon Aug 17 20:15:50 2020 (r545185) @@ -8,6 +8,7 @@ bin/ceph-coverage bin/ceph-crash bin/ceph-debugpack bin/ceph-dencoder +bin/ceph-diff-sorted bin/ceph-fuse bin/ceph-kvstore-tool bin/ceph-mds @@ -52,13 +53,14 @@ bin/rbd-mirror bin/rbd-replay bin/rbd-replay-many bin/rbdmap +bin/rgw-orphan-list etc/bash_completion.d/ceph etc/bash_completion.d/rados 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/ceph_ll_client.h include/cephfs/libcephfs.h include/rados/buffer.h include/rados/buffer_fwd.h @@ -259,6 +261,10 @@ lib/librgw_admin_user.so.1.0.0 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_prepare.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_trigger.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_zap.py +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__init__.py +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/raw/test_prepare.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/test_zap.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_configuration.py %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_decorators.py @@ -376,6 +382,7 @@ man/man8/ceph-create-keys.8.gz man/man8/ceph-debugpack.8.gz man/man8/ceph-dencoder.8.gz man/man8/ceph-deploy.8.gz +man/man8/ceph-diff-sorted.8.gz man/man8/ceph-fuse.8.gz man/man8/ceph-kvstore-tool.8.gz man/man8/ceph-mds.8.gz @@ -404,6 +411,7 @@ man/man8/rbd-replay-prep.8.gz man/man8/rbd-replay.8.gz man/man8/rbd.8.gz man/man8/rbdmap.8.gz +man/man8/rgw-orphan-list.8.gz sbin/ceph-create-keys sbin/ceph-volume sbin/mount.fuse.ceph @@ -436,6 +444,7 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/awsauth.py %%DATADIR%%/mgr/dashboard/cherrypy_backports.py %%DATADIR%%/mgr/dashboard/ci/check_grafana_uids.py +%%DATADIR%%/mgr/dashboard/constraints.txt %%DATADIR%%/mgr/dashboard/controllers/__init__.py %%DATADIR%%/mgr/dashboard/controllers/auth.py %%DATADIR%%/mgr/dashboard/controllers/cephfs.py @@ -477,8 +486,6 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/frontend/e2e/block/iscsi.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/block/mirroring.po.ts -%%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts -%%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/alerts.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/configuration.po.ts %%DATADIR%%/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts @@ -738,14 +745,18 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.scss %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.html -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.scss -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.spec.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/alert-list/alert-list.component.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.html -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.scss -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts -%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.scss +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.html %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.scss %%DATADIR%%/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts @@ -1198,6 +1209,8 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/duration.pipe.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/duration.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/empty.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/empty.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.spec.ts @@ -1214,6 +1227,8 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/list.pipe.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.spec.ts %%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/log-priority.pipe.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/map.pipe.spec.ts +%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/pipes/map.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 @@ -1362,6 +1377,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_ceph_service.py %%DATADIR%%/mgr/dashboard/tests/test_cephfs.py %%DATADIR%%/mgr/dashboard/tests/test_controllers.py %%DATADIR%%/mgr/dashboard/tests/test_docs.py @@ -1378,6 +1394,7 @@ sbin/mount.fuse.ceph %%DATADIR%%/mgr/dashboard/tests/test_pool.py %%DATADIR%%/mgr/dashboard/tests/test_prometheus.py %%DATADIR%%/mgr/dashboard/tests/test_rbd_mirroring.py +%%DATADIR%%/mgr/dashboard/tests/test_rbd_service.py %%DATADIR%%/mgr/dashboard/tests/test_rest_client.py %%DATADIR%%/mgr/dashboard/tests/test_rest_tasks.py %%DATADIR%%/mgr/dashboard/tests/test_rgw.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008172015.07HKForv032620>