Skip to content
Snippets Groups Projects

community/ceph16: upgrade to 16.2.12

Merged Duncan Bellamy requested to merge a16bitsysop/aports:3.17-ceph16 into 3.17-stable
Files
2
@@ -4,7 +4,7 @@ Forwarded: no
--- a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
+++ b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
@@ -235,7 +235,8 @@ bool Replayer<I>::get_replay_status(std:
@@ -253,7 +253,8 @@
json_spirit::mObject root_obj;
root_obj["replay_state"] = replay_state;
@@ -14,27 +14,26 @@ Forwarded: no
auto matching_remote_snap_id = util::compute_remote_snap_id(
m_state_builder->local_image_ctx->image_lock,
@@ -249,8 +250,8 @@ bool Replayer<I>::get_replay_status(std:
// use the timestamp from the matching remote image since
@@ -268,7 +269,8 @@
// the local snapshot would just be the time the snapshot was
// synced and not the consistency point in time.
- root_obj["local_snapshot_timestamp"] =
root_obj["local_snapshot_timestamp"] =
- matching_remote_snap_it->second.timestamp.sec();
+ root_obj["local_snapshot_timestamp"] = static_cast<uint64_t>(
+ matching_remote_snap_it->second.timestamp.sec());
+ static_cast<uint64_t>(
+ matching_remote_snap_it->second.timestamp.sec());
}
matching_remote_snap_it = m_state_builder->remote_image_ctx->snap_info.find(
@@ -258,7 +259,8 @@ bool Replayer<I>::get_replay_status(std:
@@ -276,7 +278,8 @@
if (m_remote_snap_id_end != CEPH_NOSNAP &&
matching_remote_snap_it !=
m_state_builder->remote_image_ctx->snap_info.end()) {
- root_obj["syncing_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
+ root_obj["syncing_snapshot_timestamp"] = static_cast<uint64_t>(
+ remote_snap_info->timestamp.sec());
root_obj["syncing_percent"] = static_cast<uint64_t>(
100 * m_local_mirror_snap_ns.last_copied_object_number /
static_cast<float>(std::max<uint64_t>(1U, m_local_object_count)));
if (m_local_object_count > 0) {
root_obj["syncing_percent"] =
--- a/src/s3select/include/s3select_functions.h
+++ b/src/s3select/include/s3select_functions.h
@@ -585,7 +585,7 @@ struct _fn_diff_timestamp : public base_
Loading