From: myoungwon oh <omwmw@sk.com>
Date: Thu, 25 May 2017 20:50:11 +0000 (+0900)
Subject: osd: prevent upgrading unsupported cluster
X-Git-Tag: v12.1.0~57^2~9^2~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dbcbb55152fbacb171c7c35f2fa6f736b281ce1;p=ceph.git

osd: prevent upgrading unsupported cluster

Signed-off-by: Myoungwon Oh omwmw@sk.com
Signed-off-by: Sage Weil sage@redhat.com
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index e41e105d3ef..c462047a7f0 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -5803,6 +5803,10 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	  result = -ENOENT;
 	  break;
 	}
+	if (!get_osdmap()->test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) {
+	  result = -EOPNOTSUPP;
+	  break;
+	}
 
 	object_t target_name;
 	object_locator_t target_oloc;