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

Merge PR #27732 into master

Browse Source 
* refs/pull/27732/head:
	common/assert: include ceph_abort_msg(arg) arg in log output

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Sage Weil 2019-04-26 13:24:01 -05:00
commit d1b8093174
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/assert.cc
View File

@ -172,8 +172,10 @@ namespace ceph {
BackTrace *bt = new BackTrace(1);
snprintf(g_assert_msg, sizeof(g_assert_msg),
"%s: In function '%s' thread %llx time %s\n"
"%s: %d: abort()\n", file, func, (unsigned long long)pthread_self(),
tss.str().c_str(), file, line);
"%s: %d: ceph_abort_msg(\"%s\")\n", file, func,
(unsigned long long)pthread_self(),
tss.str().c_str(), file, line,
msg.c_str());
dout_emergency(g_assert_msg);
// TODO: get rid of this memory allocation.