Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
1.2k
Issue boards
Milestones
Code
Merge requests
659
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Merge requests
!45992
community/ceph16: upgrade to 16.2.12
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
community/ceph16: upgrade to 16.2.12
a16bitsysop/aports:3.17-ceph16
into
3.17-stable
Overview
0
Commits
1
Pipelines
4
Changes
2
Merged
Duncan Bellamy
requested to merge
a16bitsysop/aports:3.17-ceph16
into
3.17-stable
1 year ago
Overview
0
Commits
1
Pipelines
4
Changes
2
Expand
https://ceph.io/en/news/blog/2023/v16-2-12-pacific-released/
👍
0
👎
0
Merge request reports
Compare
3.17-stable
version 3
b90aa718
1 year ago
version 2
b90aa718
1 year ago
version 1
b90aa718
1 year ago
3.17-stable (base)
and
latest version
latest version
e661d3b7
1 commit,
1 year ago
version 3
b90aa718
1 commit,
1 year ago
version 2
b90aa718
1 commit,
1 year ago
version 1
b90aa718
1 commit,
1 year ago
2 files
+
12
−
13
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
community/ceph16/30-ubuntu-32bit-fixes.patch.noauto
+
9
−
10
Options
@@ -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
@@ -2
3
5,7 +2
3
5,8 @@
bool Replayer<I>::get_replay_status(std:
@@ -25
3
,7 +25
3
,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(
@@ -2
58
,7 +2
59
,8 @@
bool Replayer<I>::get_replay_status(std:
@@ -2
76
,7 +2
78
,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