RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23918 from dzafman/wip-fix-assert

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

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Xie Xingguo 2018-09-05 08:51:06 +08:00 committed by GitHub
commit ae9d1f1a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/PGBackend.cc
View 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);