From: Sage Weil <sage@redhat.com>
Date: Sat, 27 May 2017 03:01:26 +0000 (-0400)
Subject: ceph_test_rados_api_tier: skip redirect tests if not luminous
X-Git-Tag: v12.1.0~57^2~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15325%2Fhead;p=ceph.git

ceph_test_rados_api_tier: skip redirect tests if not luminous

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc
index a7a5995dfd75..1296acd0b75a 100755
--- a/src/test/librados/tier.cc
+++ b/src/test/librados/tier.cc
@@ -2746,6 +2746,19 @@ TEST_F(LibRadosTwoPoolsPP, CachePin) {
 }
 
 TEST_F(LibRadosTwoPoolsPP, SetRedirectRead) {
+  // skip test if not yet luminous
+  {
+    bufferlist inbl, outbl;
+    ASSERT_EQ(0, cluster.mon_command(
+		"{\"prefix\": \"osd dump\"}",
+		inbl, &outbl, NULL));
+    string s(outbl.c_str(), outbl.length());
+    if (s.find("luminous") == std::string::npos) {
+      cout << "cluster is not yet luminous, skipping test" << std::endl;
+      return;
+    }
+  }
+
   // create object
   {
     bufferlist bl;
@@ -5432,6 +5445,19 @@ TEST_F(LibRadosTwoPoolsECPP, CachePin) {
   cluster.wait_for_latest_osdmap();
 }
 TEST_F(LibRadosTwoPoolsECPP, SetRedirectRead) {
+  // skip test if not yet luminous
+  {
+    bufferlist inbl, outbl;
+    ASSERT_EQ(0, cluster.mon_command(
+		"{\"prefix\": \"osd dump\"}",
+		inbl, &outbl, NULL));
+    string s(outbl.c_str(), outbl.length());
+    if (s.find("luminous") == std::string::npos) {
+      cout << "cluster is not yet luminous, skipping test" << std::endl;
+      return;
+    }
+  }
+
   // create object
   {
     bufferlist bl;