Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Enhancement] Add interface failure_handler_after_output_log to glog (backport #49065) #49599

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,13 @@ if [ ! -f $PATCHED_MARK ] && [ $GLOG_SOURCE == "glog-0.3.3" ]; then
fi
if [ ! -f $PATCHED_MARK ] && [ $GLOG_SOURCE == "glog-0.4.0" ]; then
patch -p1 < $TP_PATCH_DIR/glog-0.4.0-for-starrocks2.patch
patch -p1 < $TP_PATCH_DIR/glog-0.4.0-remove-unwind-dependency.patch
patch -p1 < $TP_PATCH_DIR/glog-0.4.0-remove-unwind-dependency.patch
patch -p1 < $TP_PATCH_DIR/glog-0.4.0-add-handler-after-output-log.patch
touch $PATCHED_MARK
fi
if [ ! -f $PATCHED_MARK ] && [ $GLOG_SOURCE == "glog-0.7.1" ]; then
patch -p1 < $TP_PATCH_DIR/glog-0.7.1.patch
patch -p1 < $TP_PATCH_DIR/glog-0.7.1-add-handler-after-output-log.patch
touch $PATCHED_MARK
fi
cd -
Expand Down
48 changes: 48 additions & 0 deletions thirdparty/patches/glog-0.4.0-add-handler-after-output-log.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index ff7c1c2..3a1df70 100644
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -1662,6 +1662,8 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureSignalHandler();
GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
void (*writer)(const char* data, int size));

+GOOGLE_GLOG_DLL_DECL void InstallFailureHandlerAfterOutputLog(void (*handler)());
+
@ac_google_end_namespace@

#endif // _LOGGING_H_
diff --git a/src/signalhandler.cc b/src/signalhandler.cc
index 961ee96..ec31c06 100644
--- a/src/signalhandler.cc
+++ b/src/signalhandler.cc
@@ -154,6 +154,8 @@ void WriteToStderr(const char* data, int size) {
// The writer function can be changed by InstallFailureWriter().
void (*g_failure_writer)(const char* data, int size) = WriteToStderr;

+void (*g_failure_handler_after_output_log)() = nullptr;
+
// Dumps time information. We don't dump human-readable time information
// as localtime() is not guaranteed to be async signal safe.
void DumpTimeInfo() {
@@ -347,6 +349,10 @@ void FailureSignalHandler(int signal_number,
// causes problems.
FlushLogFilesUnsafe(0);

+ if (g_failure_handler_after_output_log != nullptr) {
+ (*g_failure_handler_after_output_log)();
+ }
+
// Kill ourself by the default signal handler.
InvokeDefaultSignalHandler(signal_number);
}
@@ -400,4 +406,10 @@ void InstallFailureWriter(void (*writer)(const char* data, int size)) {
#endif // HAVE_SIGACTION
}

+void InstallFailureHandlerAfterOutputLog(void (*handler)()) {
+#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS)
+ g_failure_handler_after_output_log = handler;
+#endif // HAVE_SIGACTION
+}
+
_END_GOOGLE_NAMESPACE_
48 changes: 48 additions & 0 deletions thirdparty/patches/glog-0.7.1-add-handler-after-output-log.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/src/glog/logging.h b/src/glog/logging.h
index 8b90782..c4a569d 100644
--- a/src/glog/logging.h
+++ b/src/glog/logging.h
@@ -1740,6 +1740,8 @@ GLOG_EXPORT bool IsFailureSignalHandlerInstalled();
GLOG_EXPORT void InstallFailureWriter(void (*writer)(const char* data,
size_t size));

+GLOG_EXPORT void InstallFailureHandlerAfterOutputLog(void (*handler)());
+
// Dump stack trace as a string.
GLOG_EXPORT std::string GetStackTrace();

diff --git a/src/signalhandler.cc b/src/signalhandler.cc
index c5bae59..96df08d 100644
--- a/src/signalhandler.cc
+++ b/src/signalhandler.cc
@@ -166,6 +166,8 @@ void WriteToStderr(const char* data, size_t size) {
// The writer function can be changed by InstallFailureWriter().
void (*g_failure_writer)(const char* data, size_t size) = WriteToStderr;

+void (*g_failure_handler_after_output_log)() = nullptr;
+
// Dumps time information. We don't dump human-readable time information
// as localtime() is not guaranteed to be async signal safe.
void DumpTimeInfo() {
@@ -333,6 +335,10 @@ static void HandleSignal(int signal_number
// causes problems.
FlushLogFilesUnsafe(GLOG_INFO);

+ if (g_failure_handler_after_output_log != nullptr) {
+ (*g_failure_handler_after_output_log)();
+ }
+
// Kill ourself by the default signal handler.
InvokeDefaultSignalHandler(signal_number);
}
@@ -399,4 +405,10 @@ void InstallFailureWriter(void (*writer)(const char* data, size_t size)) {
#endif // HAVE_SIGACTION
}

+void InstallFailureHandlerAfterOutputLog(void (*handler)()) {
+#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS)
+ g_failure_handler_after_output_log = handler;
+#endif // HAVE_SIGACTION
+}
+
} // namespace google
Loading