From: myoungwon oh <omwmw@sk.com>
Date: Tue, 5 Dec 2017 06:54:03 +0000 (+0900)
Subject: src/test: remove version check and add data alignment for chunk_read test
X-Git-Tag: v13.0.2~629^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fca74efe04599dbab2d5a98abe96186d46a7c603;p=ceph.git

src/test: remove version check and add data alignment for chunk_read test

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 104614dbeca0..d0ea5b82c523 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -2133,7 +2133,6 @@ public:
 
     for (int i = 0; i < 2; i++) {
       assert(completions[i]->is_complete()); 
-      uint64_t version = completions[i]->get_version64();
       int err = completions[i]->get_return_value();
       if (err != retval) {
         cerr << num << ": Error: oid " << oid << " read returned different error codes: "
@@ -2147,11 +2146,6 @@ public:
           ceph_abort();
         }
       }
-      if (version != tgt_value.version) {
-	cerr << num << ": oid " << oid << " version is " << version
-	     << " and expected " << tgt_value.version << std::endl;
-	assert(version == tgt_value.version);
-      }
     }
 
     if (!retval) {
diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc
index c87cdcb0dad5..3e76818259f4 100644
--- a/src/test/osd/TestRados.cc
+++ b/src/test/osd/TestRados.cc
@@ -199,10 +199,14 @@ public:
 	}
 	uint32_t rand_offset = rand() % max_len;
 	uint32_t rand_length = rand() % max_len;
+	rand_offset = rand_offset - (rand_offset % 512);
+	rand_length = rand_length - (rand_length % 512);
 
 	while (rand_offset + rand_length > max_len || rand_length == 0) {
 	  rand_offset = rand() % max_len;
 	  rand_length = rand() % max_len;
+	  rand_offset = rand_offset - (rand_offset % 512);
+	  rand_length = rand_length - (rand_length % 512);
 	}
 	uint32_t rand_tgt_offset = rand_offset;
 	cout << m_op << ": " << "set_chunk oid " << oid.str() << " offset: " << rand_offset