diff options
| author | Sage Weil <sage@redhat.com> | 2019-04-23 23:48:52 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-04-23 23:48:52 +0200 |
| commit | 6f2743b66cb6e8b80dd8e7cc07f2b5e470adcf67 (patch) | |
| tree | feeaa52486ef1ba532042d0b4c615e94f39a04c1 /src/common/assert.cc | |
| parent | Merge pull request #26107 from alimaredia/wip-dpp-rgw-put-obj-processor (diff) | |
| download | ceph-6f2743b66cb6e8b80dd8e7cc07f2b5e470adcf67.tar.xz ceph-6f2743b66cb6e8b80dd8e7cc07f2b5e470adcf67.zip | |
common/assert: include ceph_abort_msg(arg) arg in log output
This will also be part of the "assert_msg" field in the crash dump.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/common/assert.cc')
| -rw-r--r-- | src/common/assert.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/assert.cc b/src/common/assert.cc index 0f3e1e2e097..6fb50014f43 100644 --- a/src/common/assert.cc +++ b/src/common/assert.cc @@ -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. |