]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Change assert() to ceph_assert() missed in the transition 23918/head
authorDavid Zafman <dzafman@redhat.com>
Tue, 4 Sep 2018 18:43:35 +0000 (11:43 -0700)
committerDavid Zafman <dzafman@redhat.com>
Tue, 4 Sep 2018 21:40:23 +0000 (14:40 -0700)
Caused by: c789fd1899f697a994a28e45a6f9262c6721d77d

Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/PGBackend.cc

index 03dc4b41283d35f398c54e5763364a6ad18eb675..205b59940b94c2c9a2ba6b2595219575c669b972 100644 (file)
@@ -682,8 +682,8 @@ bool PGBackend::be_compare_scrub_objects(
     auto can_attr = candidate.attrs.find(OI_ATTR);
     auto auth_attr = auth.attrs.find(OI_ATTR);
 
-    assert(auth_attr != auth.attrs.end());
-    assert(can_attr != candidate.attrs.end());
+    ceph_assert(auth_attr != auth.attrs.end());
+    ceph_assert(can_attr != candidate.attrs.end());
 
     can_bl.push_back(can_attr->second);
     auth_bl.push_back(auth_attr->second);
@@ -702,8 +702,8 @@ bool PGBackend::be_compare_scrub_objects(
       auto can_attr = candidate.attrs.find(SS_ATTR);
       auto auth_attr = auth.attrs.find(SS_ATTR);
 
-      assert(auth_attr != auth.attrs.end());
-      assert(can_attr != candidate.attrs.end());
+      ceph_assert(auth_attr != auth.attrs.end());
+      ceph_assert(can_attr != candidate.attrs.end());
 
       can_bl.push_back(can_attr->second);
       auth_bl.push_back(auth_attr->second);
@@ -723,8 +723,8 @@ bool PGBackend::be_compare_scrub_objects(
       auto can_hi = candidate.attrs.find(ECUtil::get_hinfo_key());
       auto auth_hi = auth.attrs.find(ECUtil::get_hinfo_key());
 
-      assert(auth_hi != auth.attrs.end());
-      assert(can_hi != candidate.attrs.end());
+      ceph_assert(auth_hi != auth.attrs.end());
+      ceph_assert(can_hi != candidate.attrs.end());
 
       can_bl.push_back(can_hi->second);
       auth_bl.push_back(auth_hi->second);