From: Samuel Just <sjust@redhat.com>
Date: Fri, 13 Dec 2019 20:06:31 +0000 (-0800)
Subject: osd/PGBackend: rename submit_transaction field roll_forward_to
X-Git-Tag: v15.1.0~411^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a335a2599d8ff878109e6a0940cf1c839dc26aec;p=ceph.git

osd/PGBackend: rename submit_transaction field roll_forward_to

This field is actually just a lower bound on committed, client
visible log versions.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index e82b64fae1de..27c3dd03223f 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1485,7 +1485,7 @@ void ECBackend::submit_transaction(
   const eversion_t &at_version,
   PGTransactionUPtr &&t,
   const eversion_t &trim_to,
-  const eversion_t &roll_forward_to,
+  const eversion_t &min_last_complete_ondisk,
   const vector<pg_log_entry_t> &log_entries,
   std::optional<pg_hit_set_history_t> &hset_history,
   Context *on_all_commit,
@@ -1500,7 +1500,7 @@ void ECBackend::submit_transaction(
   op->delta_stats = delta_stats;
   op->version = at_version;
   op->trim_to = trim_to;
-  op->roll_forward_to = std::max(roll_forward_to, committed_to);
+  op->roll_forward_to = std::max(min_last_complete_ondisk, committed_to);
   op->log_entries = log_entries;
   std::swap(op->updated_hit_set_history, hset_history);
   op->on_all_commit = on_all_commit;
diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index 230542bc6de5..c34c5c52e1eb 100644
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -102,7 +102,7 @@ public:
     const eversion_t &at_version,
     PGTransactionUPtr &&t,
     const eversion_t &trim_to,
-    const eversion_t &roll_forward_to,
+    const eversion_t &min_last_complete_ondisk,
     const vector<pg_log_entry_t> &log_entries,
     std::optional<pg_hit_set_history_t> &hset_history,
     Context *on_all_commit,
diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index 513c62763352..1b4c48fd48ce 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -448,7 +448,8 @@ typedef std::shared_ptr<const OSDMap> OSDMapRef;
      const eversion_t &at_version,        ///< [in] version
      PGTransactionUPtr &&t,               ///< [in] trans to execute (move)
      const eversion_t &trim_to,           ///< [in] trim log to here
-     const eversion_t &roll_forward_to,  ///< [in] trim rollback info to here
+     const eversion_t &min_last_complete_ondisk, ///< [in] lower bound on
+                                                 ///  committed version
      const vector<pg_log_entry_t> &log_entries, ///< [in] log entries for t
      /// [in] hitset history (if updated with this transaction)
      std::optional<pg_hit_set_history_t> &hset_history,
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 4e272e492ee9..98195ba304ee 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -365,7 +365,7 @@ public:
     const eversion_t &at_version,
     PGTransactionUPtr &&t,
     const eversion_t &trim_to,
-    const eversion_t &roll_forward_to,
+    const eversion_t &min_last_complete_ondisk,
     const vector<pg_log_entry_t> &log_entries,
     std::optional<pg_hit_set_history_t> &hset_history,
     Context *on_all_commit,