From: Sage Weil <sage@redhat.com>
Date: Wed, 17 Jul 2019 16:55:42 +0000 (-0500)
Subject: osd/ECTransaction,ReplicatedBackend: create op is new in octopus
X-Git-Tag: v15.1.0~2175^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=deed241fcc360807c652d833a76ada892a911fae;p=ceph.git

osd/ECTransaction,ReplicatedBackend: create op is new in octopus

Not nautilus!

Fixes: https://tracker.ceph.com/issues/40755
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index 0489fd7b5a78..1eec367c976c 100644
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -265,7 +265,7 @@ void ECTransaction::generate_transactions(
 	[&](const PGTransaction::ObjectOperation::Init::None &) {},
 	[&](const PGTransaction::ObjectOperation::Init::Create &op) {
 	  for (auto &&st: *transactions) {
-	    if (require_osd_release >= ceph_release_t::nautilus) {
+	    if (require_osd_release >= ceph_release_t::octopus) {
 	      st.second.create(
 		coll_t(spg_t(pgid, st.first)),
 		ghobject_t(oid, ghobject_t::NO_GEN, st.first));
diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 31e0af78d4ea..b90b1a81ca0c 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -324,7 +324,7 @@ void generate_transaction(
 	[&](const PGTransaction::ObjectOperation::Init::None &) {
 	},
 	[&](const PGTransaction::ObjectOperation::Init::Create &op) {
-	  if (require_osd_release >= ceph_release_t::nautilus) {
+	  if (require_osd_release >= ceph_release_t::octopus) {
 	    t->create(coll, goid);
 	  } else {
 	    t->touch(coll, goid);