From: David Zafman <dzafman@redhat.com>
Date: Tue, 4 Sep 2018 18:43:35 +0000 (-0700)
Subject: osd: Change assert() to ceph_assert() missed in the transition
X-Git-Tag: v14.0.1~410^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23918%2Fhead;p=ceph.git

osd: Change assert() to ceph_assert() missed in the transition

Caused by: c789fd1899f697a994a28e45a6f9262c6721d77d

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 03dc4b41283d..205b59940b94 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -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);