diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo index 47485b0969a0..ecb5f6a89c8c 100644 --- a/net/ceph14/distinfo +++ b/net/ceph14/distinfo @@ -1,33 +1,33 @@ -TIMESTAMP = 1597409334 -SHA256 (ceph-ceph-v14.2.11_GH0.tar.gz) = 45470f70befab52dbf143224e3e9bfc90870369ae9413677e79f387863e76a80 -SIZE (ceph-ceph-v14.2.11_GH0.tar.gz) = 21948721 +TIMESTAMP = 1621102521 +SHA256 (ceph-ceph-v14.2.21_GH0.tar.gz) = a21743228d64d096119b2a92e871277bec6c60f7d274069c23e5a7c8da7f194a +SIZE (ceph-ceph-v14.2.21_GH0.tar.gz) = 21956991 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 SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192 SHA256 (ceph-civetweb-bb99e93_GH0.tar.gz) = 1f8498176bf27381fb5516abae0e9068315e20f233cf5270123f38caa68691b0 SIZE (ceph-civetweb-bb99e93_GH0.tar.gz) = 11349651 SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155 SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149 SHA256 (ceph-dmclock-4496dbc_GH0.tar.gz) = 17f31174445058d76bb1895865d9def549fe668a050a8cea9ddd7b34125659d7 SIZE (ceph-dmclock-4496dbc_GH0.tar.gz) = 69730 SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d SIZE (ceph-gf-complete-7e61b44_GH0.tar.gz) = 342303 SHA256 (ceph-jerasure-96c76b8_GH0.tar.gz) = 06edaeb8cb5c3076e34cb53dd91c91d54d46fb8c3b837c6280ea2ed076556beb SIZE (ceph-jerasure-96c76b8_GH0.tar.gz) = 806334 SHA256 (ceph-googletest-fdb8504_GH0.tar.gz) = ece3265dae4d0fe5a52e7164432bb416de8bdb45e1c8cf8f361bbe893db30bb8 SIZE (ceph-googletest-fdb8504_GH0.tar.gz) = 1281068 SHA256 (ceph-isa-l-7e1a337_GH0.tar.gz) = 8099bc6ca3ca6ed9376f6cc5072a84d7a1863e2d7f2344bf08682d4efb7ae788 SIZE (ceph-isa-l-7e1a337_GH0.tar.gz) = 458398 SHA256 (ceph-lua-1fce39c_GH0.tar.gz) = fb5f778ce4da349ca903512a2fdb3987b12e3f0a52ab088fb011a8e4dd55848c SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778 SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457 SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08a450b4dced532e6e9f71aca8b90 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 (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 +SHA256 (ceph-spawn-5f4742f_GH0.tar.gz) = c8832724cf3dd873db7c10407404b6cef30fa770902ab446f830902fed21603a +SIZE (ceph-spawn-5f4742f_GH0.tar.gz) = 7319 diff --git a/net/ceph14/files/file-git_version b/net/ceph14/files/file-git_version index b351307c54fb..7da6dfe13228 100644 --- a/net/ceph14/files/file-git_version +++ b/net/ceph14/files/file-git_version @@ -1,2 +1,2 @@ -f7fdb2f52131f54b891a2ec99d8205561242cdaf -v14.2.11 +5ef401921d7a88aea18ec7558f7f9374ebd8f5a6 +v14.2.21-212-g5ef401921d7 diff --git a/net/ceph14/files/patch-src_mgr_ActivePyModules.cc b/net/ceph14/files/patch-src_mgr_ActivePyModules.cc new file mode 100644 index 000000000000..74de556d9172 --- /dev/null +++ b/net/ceph14/files/patch-src_mgr_ActivePyModules.cc @@ -0,0 +1,29 @@ +--- src/mgr/ActivePyModules.cc.orig 2021-05-13 17:23:08 UTC ++++ src/mgr/ActivePyModules.cc +@@ -497,7 +497,7 @@ void ActivePyModules::notify_all(const std::string &no + // Send all python calls down a Finisher to avoid blocking + // C++ code, and avoid any potential lock cycles. + dout(15) << "queuing notify to " << name << dendl; +- finisher.queue(new FunctionContext([module, notify_type, notify_id](int r){ ++ finisher.queue(new FunctionContext([module = module, notify_type, notify_id](int r){ + module->notify(notify_type, notify_id); + })); + } +@@ -516,7 +516,7 @@ void ActivePyModules::notify_all(const LogEntry &log_e + // log_entry: we take a copy because caller's instance is + // probably ephemeral. + dout(15) << "queuing notify (clog) to " << name << dendl; +- finisher.queue(new FunctionContext([module, log_entry](int r){ ++ finisher.queue(new FunctionContext([module = module, log_entry](int r){ + module->notify_clog(log_entry); + })); + } +@@ -1015,7 +1015,7 @@ void ActivePyModules::config_notify() + // Send all python calls down a Finisher to avoid blocking + // C++ code, and avoid any potential lock cycles. + dout(15) << "notify (config) " << name << dendl; +- finisher.queue(new FunctionContext([module](int r){ ++ finisher.queue(new FunctionContext([module = module](int r){ + module->config_notify(); + })); + } diff --git a/net/ceph14/files/patch-src_os_bluestore_KernelDevice.cc b/net/ceph14/files/patch-src_os_bluestore_KernelDevice.cc new file mode 100644 index 000000000000..a6bbd4e1edbc --- /dev/null +++ b/net/ceph14/files/patch-src_os_bluestore_KernelDevice.cc @@ -0,0 +1,11 @@ +--- src/os/bluestore/KernelDevice.cc.orig 2021-05-13 17:23:08 UTC ++++ src/os/bluestore/KernelDevice.cc +@@ -67,7 +67,7 @@ int KernelDevice::_lock() + for (;;) { + struct flock fl = { F_WRLCK, + SEEK_SET }; +- int r = ::fcntl(fd, F_OFD_SETLK, &fl); ++ int r = ::fcntl(fd, F_SETLK, &fl); + if (r < 0) { + if (errno == EINVAL) { + r = ::flock(fd, LOCK_EX | LOCK_NB); 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 c69145759f26..000000000000 --- 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 reloader(std::in_place, store, -- service_map_meta, &pauser); -+ auto reloader = std::make_unique(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 32824ac25017..000000000000 --- 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 - #include - #include -+#ifdef __linux__ - #include -+#endif -+#ifdef __FreeBSD__ -+#include -+#endif - - rados_t cluster; - diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message index 12b648acd972..e590eda16587 100644 --- a/net/ceph14/pkg-message +++ b/net/ceph14/pkg-message @@ -1,19 +1,17 @@ [ { type: install message: <