From: J. Eric Ivancich <ivancich@redhat.com>
Date: Wed, 13 Sep 2017 22:01:43 +0000 (-0400)
Subject: osd: fix tests of mclock implementations to track opimizations for op wq
X-Git-Tag: v13.0.1~883^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=360c8954aa096a6d06dcb3390b479090e7d7b3db;p=ceph.git

osd: fix tests of mclock implementations to track opimizations for op wq

wip-osd-deq changes client identifiers from entity_inst_t to
uint64_t. Updates tests to do this as well.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
---

diff --git a/src/test/osd/TestMClockClientQueue.cc b/src/test/osd/TestMClockClientQueue.cc
index 69d2f38ddb23..498acd9ddda9 100644
--- a/src/test/osd/TestMClockClientQueue.cc
+++ b/src/test/osd/TestMClockClientQueue.cc
@@ -25,38 +25,38 @@ class MClockClientQueueTest : public testing::Test {
 public:
   mClockClientQueue q;
 
-  entity_inst_t client1;
-  entity_inst_t client2;
-  entity_inst_t client3;
+  uint64_t client1;
+  uint64_t client2;
+  uint64_t client3;
 
   MClockClientQueueTest() :
     q(g_ceph_context),
-    client1(entity_name_t(CEPH_ENTITY_TYPE_OSD, 1), entity_addr_t()),
-    client2(entity_name_t(CEPH_ENTITY_TYPE_OSD, 2), entity_addr_t()),
-    client3(entity_name_t(CEPH_ENTITY_TYPE_CLIENT, 1), entity_addr_t())
+    client1(1001),
+    client2(9999),
+    client3(100000001)
   {}
 
 #if 0 // more work needed here
-  Request create_client_op(epoch_t e, const entity_inst_t& owner) {
+  Request create_client_op(epoch_t e, uint64_t owner) {
     return Request(spg_t(), PGQueueable(OpRequestRef(), e));
   }
 #endif
 
-  Request create_snaptrim(epoch_t e, const entity_inst_t& owner) {
+  Request create_snaptrim(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGSnapTrim(e),
 			       12, 12,
 			       utime_t(), owner, e));
   }
 
-  Request create_scrub(epoch_t e, const entity_inst_t& owner) {
+  Request create_scrub(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGScrub(e),
 			       12, 12,
 			       utime_t(), owner, e));
   }
 
-  Request create_recovery(epoch_t e, const entity_inst_t& owner) {
+  Request create_recovery(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGRecovery(e, 64),
 			       12, 12,
diff --git a/src/test/osd/TestMClockOpClassQueue.cc b/src/test/osd/TestMClockOpClassQueue.cc
index b52445147909..b18587f491a6 100644
--- a/src/test/osd/TestMClockOpClassQueue.cc
+++ b/src/test/osd/TestMClockOpClassQueue.cc
@@ -27,38 +27,38 @@ class MClockOpClassQueueTest : public testing::Test {
 public:
   mClockOpClassQueue q;
 
-  entity_inst_t client1;
-  entity_inst_t client2;
-  entity_inst_t client3;
+  uint64_t client1;
+  uint64_t client2;
+  uint64_t client3;
 
   MClockOpClassQueueTest() :
     q(g_ceph_context),
-    client1(entity_name_t(CEPH_ENTITY_TYPE_OSD, 1), entity_addr_t()),
-    client2(entity_name_t(CEPH_ENTITY_TYPE_OSD, 2), entity_addr_t()),
-    client3(entity_name_t(CEPH_ENTITY_TYPE_CLIENT, 1), entity_addr_t())
+    client1(1001),
+    client2(9999),
+    client3(100000001)
   {}
 
 #if 0 // more work needed here
-  Request create_client_op(epoch_t e, const entity_inst_t& owner) {
+  Request create_client_op(epoch_t e, uint64_t owner) {
     return Request(spg_t(), PGQueueable(OpRequestRef(), e));
   }
 #endif
 
-  Request create_snaptrim(epoch_t e, const entity_inst_t& owner) {
+  Request create_snaptrim(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGSnapTrim(e),
 			       12, 12,
 			       utime_t(), owner, e));
   }
 
-  Request create_scrub(epoch_t e, const entity_inst_t& owner) {
+  Request create_scrub(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGScrub(e),
 			       12, 12,
 			       utime_t(), owner, e));
   }
 
-  Request create_recovery(epoch_t e, const entity_inst_t& owner) {
+  Request create_recovery(epoch_t e, uint64_t owner) {
     return Request(spg_t(),
 		   PGQueueable(PGRecovery(e, 64),
 			       12, 12,