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 69d2f38ddb23f135e431022735e626e05292547d..498acd9ddda927aa88c006c8295daffdb4c36c96 100644 (file)
--- 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 b524451479093a3be09a6001cb09397ea46cb93c..b18587f491a6e8a17323b5e9d898eaf3cef63547 100644 (file)
--- 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,