summaryrefslogtreecommitdiffstats
path: root/src/global
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2020-12-10 07:17:07 +0100
committerKefu Chai <kchai@redhat.com>2020-12-10 11:26:39 +0100
commit1f5406a752724b55b4fc6c1641d72e3d9c3ba74d (patch)
treefd3bfd554a8169b9d87ecb150d7af5f2ac07064a /src/global
parentcmake: reorder linked libraries of crimson-alienstore (diff)
downloadceph-1f5406a752724b55b4fc6c1641d72e3d9c3ba74d.tar.xz
ceph-1f5406a752724b55b4fc6c1641d72e3d9c3ba74d.zip
src/*: do not pass cct to ceph_version_to_str()
in e5b1ae5554c4d8a20f9f0ff562b231ad0b0ba0ab, a new option named "debug_version_for_testing" is introduced to override the version so we can test version check. in crimson, we have two families of shared functions. - one of them is used by alien store. they are compiled with -DWITH_SEASTAR and -DWITH_ALIEN, to enable the shim code between seastar and POSIX thread. - another is used by crimson in general. where no lock is allowed. currently, we use the "crimson" and "ceph" namespace to differentiate these two families of functions, so they can colocate in the same executable without violating the ODR. see src/include/common_fwd.h for more details. the functions defined in src/common/version.cc are also shared by alien store and crimson code. and because we have different implementations of `CephContext` in crimson and in classic OSD (i.e. alienstore), we have to have different implementations of this function as well, if we follow the same approach. but since these functions are very simple and are non-blocking, there is not much value in differentiating them, it is better to inject the test settings using environment variable instead of using ceph option subsystem. in this change, "ceph_debug_version_for_testing" environment variable is checked instead, so that crimson and alienstore can share the same compilation unit of version.cc. and "debug_version_for_testing" option is removed. Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/global')
-rw-r--r--src/global/signal_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc
index a9e9e28bf14..0447f96e1b1 100644
--- a/src/global/signal_handler.cc
+++ b/src/global/signal_handler.cc
@@ -204,7 +204,7 @@ static void handle_fatal_signal(int signum)
now.gmtime(jf.dump_stream("timestamp"));
jf.dump_string("process_name", g_process_name);
jf.dump_string("entity_name", g_ceph_context->_conf->name.to_str());
- jf.dump_string("ceph_version", ceph_version_to_str(g_ceph_context));
+ jf.dump_string("ceph_version", ceph_version_to_str());
struct utsname u;
r = uname(&u);