Skip to content

Commit

Permalink
rgw/sfs: Replace ceph_abort with ceph_abort_msg calls
Browse files Browse the repository at this point in the history
ceph_abort(msg) ignores msg using the generic "abort() called"
instead. Replace with ceph_abort_msg to get the messages in the crash
output.

Signed-off-by: Marcel Lauhoff <[email protected]>
  • Loading branch information
Marcel Lauhoff committed Oct 12, 2023
1 parent 3a2771d commit 46533b7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/rgw/driver/sfs/multipart.cc
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ int SFSMultipartUploadV2::complete(
part.part_num, partfd, objpath, objfd, cpp_strerror(errno)
)
<< dendl;
ceph_abort("Unexpected error aggregating multipart upload");
ceph_abort_msg("Unexpected error aggregating multipart upload");
}
accounted_bytes += partsize;
ret = ::fsync(objfd);
Expand All @@ -392,7 +392,7 @@ int SFSMultipartUploadV2::complete(
objfd, objpath, cpp_strerror(ret)
)
<< dendl;
ceph_abort("Unexpected error fsync'ing obj path");
ceph_abort_msg("Unexpected error fsync'ing obj path");
}
ret = ::close(partfd);
if (ret < 0) {
Expand All @@ -401,7 +401,7 @@ int SFSMultipartUploadV2::complete(
partfd, path, cpp_strerror(ret)
)
<< dendl;
ceph_abort("Unexpected error on closing part path");
ceph_abort_msg("Unexpected error on closing part path");
}
}

Expand All @@ -421,7 +421,7 @@ int SFSMultipartUploadV2::complete(
accounted_bytes, final_obj_size
)
<< dendl;
ceph_abort("BUG: on final object for multipart upload!");
ceph_abort_msg("BUG: on final object for multipart upload!");
}

lsfs_dout(dpp, 10)
Expand Down

0 comments on commit 46533b7

Please sign in to comment.