*: flush log before exit #3594
*: flush log before exit #3594
Conversation
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
src/util/panic_hook.rs
Outdated
| @@ -79,6 +80,12 @@ pub fn set_exit_hook(panic_abort: bool) { | |||
| .spawn(Backtrace::new) | |||
| .unwrap(); | |||
|
|
|||
| // Hold the guard. | |||
| lazy_static! { | |||
| pub static ref LOG_GUARD: Mutex<Option<GlobalLoggerGuard>> = Mutex::new(None); | |||
There was a problem hiding this comment.
To work around cannot move out of captured outer variable in an Fn closure.
There was a problem hiding this comment.
It's Mutex instead of static that fixes the error. 😆
src/util/panic_hook.rs
Outdated
| @@ -105,6 +112,10 @@ pub fn set_exit_hook(panic_abort: bool) { | |||
| } else { | |||
| orig_hook(info); | |||
| } | |||
|
|
|||
| // To collect remaining logs, drop guard before exit. | |||
| drop(LOG_GUARD.lock().unwrap().take()); | |||
There was a problem hiding this comment.
This doesn't seem like flushing the log. What if there is a thread that keeps writing logs?
There was a problem hiding this comment.
For the Aync Drainer, drop the guard will send a AsyncMsg::Finish which will stop the logger, it accepts no more logs, so drop returns eventually.
There was a problem hiding this comment.
Sounds hacky. Is there any more verbose and straightforward way?
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
| @@ -63,7 +64,7 @@ fn track_hook(p: &PanicInfo) { | |||
| } | |||
|
|
|||
| /// Exit the whole process when panic. | |||
| pub fn set_exit_hook(panic_abort: bool) { | |||
| pub fn set_exit_hook(panic_abort: bool, guard: Option<GlobalLoggerGuard>) { | |||
There was a problem hiding this comment.
I prefer to define an OnHook trait for more customization, not only for Logger here.
There was a problem hiding this comment.
I think it is enough, there are few things need to be called before panicking. And we can add the trait when there are more things.
| @@ -36,6 +36,7 @@ extern crate slog_async; | |||
| extern crate slog_scope; | |||
| extern crate slog_stdlog; | |||
| extern crate slog_term; | |||
| #[macro_use] | |||
There was a problem hiding this comment.
--> src/bin/util/setup.rs:62:26
|
62 | .thread_name(thd_name!("term-slogger"))
|
PTAL @Hoverbear |
|
/run-all-tests |
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen overvenus@gmail.com
What have you changed? (mandatory)
Flush remaining logs before tikv exits.
What are the type of the changes? (mandatory)
How has this PR been tested? (mandatory)
Unit tests.
Does this PR affect documentation (docs/docs-cn) update? (mandatory)
No.
Does this PR affect tidb-ansible update? (mandatory)
No.