mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: manual merge
This commit is contained in:
commit
027b64f821
1 changed files with 8 additions and 0 deletions
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include <ndb_global.h>
|
||||
#include <my_pthread.h>
|
||||
#include <sys/times.h>
|
||||
|
||||
#include "WatchDog.hpp"
|
||||
#include "GlobalData.hpp"
|
||||
|
@ -129,6 +130,13 @@ WatchDog::run(){
|
|||
break;
|
||||
}//switch
|
||||
g_eventLogger.warning("Ndb kernel is stuck in: %s", last_stuck_action);
|
||||
{
|
||||
struct tms my_tms;
|
||||
times(&my_tms);
|
||||
g_eventLogger.info("User time: %llu System time: %llu",
|
||||
(Uint64)my_tms.tms_utime,
|
||||
(Uint64)my_tms.tms_stime);
|
||||
}
|
||||
if(alerts == 3){
|
||||
shutdownSystem(last_stuck_action);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue