X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=types.patch;h=d078d5635dea8d55fba6caaf2634fe685b782f16;hb=HEAD;hp=34515e2bd534711c59e304c8aedb3fcab8bc34bf;hpb=dc8b799ea92a54dd6d8ca6d176d880696d8be508;p=packages%2Fceph.git diff --git a/types.patch b/types.patch index 34515e2..85fabe6 100644 --- a/types.patch +++ b/types.patch @@ -9,9 +9,9 @@ { d(5) << size << dendl; ---- ceph-16.2.7/src/os/bluestore/BlueFS.cc~ 2021-12-07 17:15:49.000000000 +0100 -+++ ceph-16.2.7/src/os/bluestore/BlueFS.cc 2022-02-12 21:40:54.182516511 +0100 -@@ -3799,7 +3799,7 @@ +--- ceph-17.2.7/src/os/bluestore/BlueFS.cc.orig 2024-02-24 21:45:42.755706899 +0100 ++++ ceph-17.2.7/src/os/bluestore/BlueFS.cc 2024-02-24 21:51:20.641018002 +0100 +@@ -4617,7 +4617,7 @@ size_t BlueFS::probe_alloc_avail(int dev if (dist_to_alignment >= len) return; len -= dist_to_alignment; @@ -19,18 +19,7 @@ + total += p2align((uint64_t)len, alloc_size); }; if (alloc[dev]) { - alloc[dev]->dump(iterated_allocation); ---- ceph-16.2.7/src/librbd/object_map/DiffRequest.cc.orig 2021-12-07 17:15:49.000000000 +0100 -+++ ceph-16.2.7/src/librbd/object_map/DiffRequest.cc 2022-02-12 22:17:55.163378523 +0100 -@@ -187,7 +187,7 @@ - m_object_map.resize(m_object_diff_state->size()); - } - -- uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size); -+ uint64_t overlap = std::min(m_object_map.size(), (uint64_t)prev_object_diff_state_size); - auto it = m_object_map.begin(); - auto overlap_end_it = it + overlap; - auto diff_it = m_object_diff_state->begin(); + alloc[dev]->foreach(iterated_allocation); --- ceph-16.2.7/src/tools/neorados.cc~ 2021-12-07 17:15:49.000000000 +0100 +++ ceph-16.2.7/src/tools/neorados.cc 2022-02-12 22:23:25.836643956 +0100 @@ -205,7 +205,7 @@ @@ -62,39 +51,64 @@ for (auto &[peer, peer_replayer] : m_peer_replayers) { dout(10) << ": peer=" << peer << dendl; peer_replayer->remove_directory(dir_path); ---- ceph-17.2.2/src/os/bluestore/BlueStore.cc.orig 2022-07-21 19:29:33.000000000 +0200 -+++ ceph-17.2.2/src/os/bluestore/BlueStore.cc 2022-08-23 16:55:10.753944515 +0200 -@@ -18583,7 +18583,7 @@ int BlueStore::__restore_allocator(Alloc - uint64_t extent_count = 0; - uint64_t extents_bytes_left = file_size - (header_size + trailer_size + sizeof(crc)); - while (extents_bytes_left) { -- int req_bytes = std::min(extents_bytes_left, sizeof(buffer)); -+ uint64_t req_bytes = std::min(extents_bytes_left, sizeof(buffer)); - int read_bytes = bluefs->read(p_handle.get(), offset, req_bytes, nullptr, (char*)buffer); - if (read_bytes != req_bytes) { - derr << "Failed bluefs->read()::read_bytes=" << read_bytes << ", req_bytes=" << req_bytes << dendl; ---- ceph-17.2.2/src/rgw/store/dbstore/sqlite/sqliteDB.cc.orig 2022-07-21 19:29:33.000000000 +0200 -+++ ceph-17.2.2/src/rgw/store/dbstore/sqlite/sqliteDB.cc 2022-08-24 06:15:01.162110603 +0200 -@@ -514,8 +514,10 @@ static int list_lc_head(const DoutPrefix +--- ceph-17.2.3/src/seastar/src/core/file.cc.orig 2021-12-19 23:02:10.000000000 +0100 ++++ ceph-17.2.3/src/seastar/src/core/file.cc 2022-08-28 09:19:17.258501014 +0200 +@@ -313,7 +313,7 @@ posix_file_impl::close() noexcept { - op.lc_head.index = (const char*)sqlite3_column_text(stmt, LCHeadIndex); - op.lc_head.head.marker = (const char*)sqlite3_column_text(stmt, LCHeadMarker); -- -- SQL_DECODE_BLOB_PARAM(dpp, stmt, LCHeadStartDate, op.lc_head.head.start_date, sdb); -+ -+ { int64_t start_date; -+ SQL_DECODE_BLOB_PARAM(dpp, stmt, LCHeadStartDate, start_date, sdb); -+ op.lc_head.head.start_date = start_date; } + future + blockdev_file_impl::size(void) noexcept { +- return engine()._thread_pool->submit>([this] { ++ return engine()._thread_pool->submit>([this] { + uint64_t size; + int ret = ::ioctl(_fd, BLKGETSIZE64, &size); + return wrap_syscall(ret, size); +@@ -908,7 +908,7 @@ append_challenged_posix_file_impl::trunc - return 0; + future + append_challenged_posix_file_impl::size() noexcept { +- return make_ready_future(_logical_size); ++ return make_ready_future(_logical_size); } -@@ -2773,7 +2775,8 @@ int SQLInsertLCHead::Bind(const DoutPref - SQL_BIND_TEXT(dpp, stmt, index, params->op.lc_head.head.marker.c_str(), sdb); - SQL_BIND_INDEX(dpp, stmt, index, p_params.op.lc_head.start_date.c_str(), sdb); -- SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, params->op.lc_head.head.start_date, sdb); -+ { int64_t start_date = params->op.lc_head.head.start_date; -+ SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, start_date, sdb); } + future<> +--- ceph-17.2.3/src/seastar/src/core/fstream.cc.orig 2021-12-19 23:02:10.000000000 +0100 ++++ ceph-17.2.3/src/seastar/src/core/fstream.cc 2022-08-28 09:22:32.072057177 +0200 +@@ -419,7 +419,7 @@ private: + if ((buf.size() & (_file.disk_write_dma_alignment() - 1)) != 0) { + // If buf size isn't aligned, copy its content into a new aligned buf. + // This should only happen when the user calls output_stream::flush(). +- auto tmp = allocate_buffer(align_up(buf.size(), _file.disk_write_dma_alignment())); ++ auto tmp = allocate_buffer(align_up(buf.size(), _file.disk_write_dma_alignment())); + ::memcpy(tmp.get_write(), buf.get(), buf.size()); + ::memset(tmp.get_write() + buf.size(), 0, tmp.size() - buf.size()); + buf = std::move(tmp); +--- ceph-18.2.3/src/osd/OSDMap.cc.orig 2024-04-24 21:57:21.000000000 +0200 ++++ ceph-18.2.3/src/osd/OSDMap.cc 2024-06-01 18:51:51.915566430 +0200 +@@ -6170,14 +6170,14 @@ int OSDMap::calc_read_balance_score(Ceph + } + if (prim_pgs_by_osd.count(osd)) { + auto n_prims = prim_pgs_by_osd.at(osd).size(); +- max_prims_per_osd = std::max(max_prims_per_osd, n_prims); ++ max_prims_per_osd = std::max(max_prims_per_osd, n_prims); + if (osd_pa == 0.) { + prim_on_zero_pa = true; + } + } + if (acting_prims_by_osd.count(osd)) { + auto n_aprims = acting_prims_by_osd.at(osd).size(); +- max_acting_prims_per_osd = std::max(max_acting_prims_per_osd, n_aprims); ++ max_acting_prims_per_osd = std::max(max_acting_prims_per_osd, n_aprims); + if (osd_pa != 0.) { + max_osd_score = std::max(max_osd_score, float(n_aprims) / osd_pa); + } +--- ceph-18.2.3/src/cls/rgw/cls_rgw_types.h.orig 2024-04-24 21:57:21.000000000 +0200 ++++ ceph-18.2.3/src/cls/rgw/cls_rgw_types.h 2024-06-01 20:43:58.381041708 +0200 +@@ -1226,7 +1226,7 @@ struct cls_rgw_lc_obj_head + uint64_t t = start_date; + encode(t, bl); + encode(marker, bl); +- encode(shard_rollover_date, bl); ++ encode(static_cast(shard_rollover_date), bl); + ENCODE_FINISH(bl); + } - out: - return rc;