update sources to v12.1.1

[ceph.git] / ceph / src / test / osd / TestPGLog.cc

diff --git a/ceph/src/test/osd/TestPGLog.cc b/ceph/src/test/osd/TestPGLog.cc
index 626c3cef57ccea1fbb469aad4bfed8a330c1ca97..62364e66992620a783a4fdf9cfef526fa323b84a 100644 (file)
--- a/ceph/src/test/osd/TestPGLog.cc
+++ b/ceph/src/test/osd/TestPGLog.cc
@@ -1863,7 +1863,7 @@ TEST_F(PGLogTest, filter_log_1) {
 
     int osd_id = 1;
     epoch_t epoch = 40;
-    int64_t pool_id = 0;
+    int64_t pool_id = 1;
     int bits = 2;
     int max_osd = 4;
     int pg_num = max_osd << bits;
@@ -1871,11 +1871,10 @@ TEST_F(PGLogTest, filter_log_1) {
     int num_internal = 10;
 
     // Set up splitting map
-    //ceph::shared_ptr<OSDMap> osdmap(new OSDMap());
     OSDMap *osdmap = new OSDMap;
     uuid_d test_uuid;
     test_uuid.generate_random();
-    osdmap->build_simple(g_ceph_context, epoch, test_uuid, max_osd, bits, bits);
+    osdmap->build_simple_with_pool(g_ceph_context, epoch, test_uuid, max_osd, bits, bits);
     osdmap->set_state(osd_id, CEPH_OSD_EXISTS);
 
     const string hit_set_namespace("internal");
@@ -1909,7 +1908,6 @@ TEST_F(PGLogTest, filter_log_1) {
         log.log.push_back(e);
         if (i == 1)
           log.tail = e.version;
-        //cout << "object " << e.soid << std::endl;
       }
       log.head = e.version;
       log.index();