Skip to content

Commit 5dcf201

Browse files
committed
MINOR: debug: move the "recover now" warn message after the optional notes
At the end of the too long processing warning added by commit 0950778 ("MINOR: debug: add a function to dump a stuck thread"), there can be some optional notes about lua and memory trimming. However it's a bit awkward that they appear after the "trying to recover now" message. Let's just move that message after the notes.
1 parent 5f4fe20 commit 5dcf201

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/debug.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,6 @@ void ha_stuck_warning(int thr)
780780
ha_thread_dump_done(NULL, thr);
781781
}
782782

783-
chunk_printf(&buf, " => Trying to gracefully recover now.\n");
784-
DISGUISE(write(2, buf.area, buf.data));
785-
786783
#ifdef USE_LUA
787784
if (get_tainted() & TAINTED_LUA_STUCK_SHARED && global.nbthread > 1) {
788785
chunk_printf(&buf,
@@ -809,6 +806,9 @@ void ha_stuck_warning(int thr)
809806
" 'global' section of your configuration to avoid this in the future.\n");
810807
DISGUISE(write(2, buf.area, buf.data));
811808
}
809+
810+
chunk_printf(&buf, " => Trying to gracefully recover now.\n");
811+
DISGUISE(write(2, buf.area, buf.data));
812812
}
813813

814814
/* Complain with message <msg> on stderr. If <counter> is not NULL, it is

0 commit comments

Comments
 (0)