From e9df53909e766b599e0955dcf6fec344ceb98530 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 May 2005 17:26:22 +0200 Subject: [PATCH] ndb - autotest Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads ndb/src/cw/cpcd/APIService.cpp: Add shutdown options (so far only SIGKILL) ndb/src/cw/cpcd/CPCD.hpp: Add shutdown options (so far only SIGKILL) ndb/src/cw/cpcd/Process.cpp: Add shutdown options (so far only SIGKILL) ndb/test/include/CpcClient.hpp: Add shutdown options (so far only SIGKILL) ndb/test/run-test/main.cpp: Add shutdown options (so far only SIGKILL) ndb/test/src/CpcClient.cpp: Add shutdown options (so far only SIGKILL) --- ndb/src/cw/cpcd/APIService.cpp | 1 + ndb/src/cw/cpcd/CPCD.hpp | 6 ++++++ ndb/src/cw/cpcd/Process.cpp | 9 ++++++++- ndb/test/include/CpcClient.hpp | 1 + ndb/test/run-test/main.cpp | 2 ++ ndb/test/src/CpcClient.cpp | 3 +++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ndb/src/cw/cpcd/APIService.cpp b/ndb/src/cw/cpcd/APIService.cpp index 63d0aaafe86..b009f0c0fc4 100644 --- a/ndb/src/cw/cpcd/APIService.cpp +++ b/ndb/src/cw/cpcd/APIService.cpp @@ -122,6 +122,7 @@ ParserRow commands[] = CPCD_ARG("stderr", String, Optional, "Redirection of stderr"), CPCD_ARG("stdin", String, Optional, "Redirection of stderr"), CPCD_ARG("ulimit", String, Optional, "ulimit"), + CPCD_ARG("shutdown", String, Optional, "shutdown options"), CPCD_CMD("undefine process", &CPCDAPISession::undefineProcess, ""), CPCD_CMD_ALIAS("undef", "undefine process", 0), diff --git a/ndb/src/cw/cpcd/CPCD.hpp b/ndb/src/cw/cpcd/CPCD.hpp index a5c0bef1dac..aecc43150c4 100644 --- a/ndb/src/cw/cpcd/CPCD.hpp +++ b/ndb/src/cw/cpcd/CPCD.hpp @@ -243,6 +243,12 @@ public: * @desc Format c:unlimited d:0 ... */ BaseString m_ulimit; + + /** + * @brief shutdown options + */ + BaseString m_shutdown_options; + private: class CPCD *m_cpcd; void do_exec(); diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp index 2509f34e882..fc5dc2d8839 100644 --- a/ndb/src/cw/cpcd/Process.cpp +++ b/ndb/src/cw/cpcd/Process.cpp @@ -44,6 +44,8 @@ CPCD::Process::print(FILE * f){ fprintf(f, "stdout: %s\n", m_stdout.c_str() ? m_stdout.c_str() : ""); fprintf(f, "stderr: %s\n", m_stderr.c_str() ? m_stderr.c_str() : ""); fprintf(f, "ulimit: %s\n", m_ulimit.c_str() ? m_ulimit.c_str() : ""); + fprintf(f, "shutdown: %s\n", m_shutdown_options.c_str() ? + m_shutdown_options.c_str() : ""); } CPCD::Process::Process(const Properties & props, class CPCD *cpcd) { @@ -64,6 +66,7 @@ CPCD::Process::Process(const Properties & props, class CPCD *cpcd) { props.get("stdout", m_stdout); props.get("stderr", m_stderr); props.get("ulimit", m_ulimit); + props.get("shutdown", m_shutdown_options); m_status = STOPPED; if(strcasecmp(m_type.c_str(), "temporary") == 0){ @@ -451,7 +454,11 @@ CPCD::Process::stop() { m_status = STOPPING; errno = 0; - int ret = kill(-m_pid, SIGTERM); + int signo= SIGTERM; + if(m_shutdown_options == "SIGKILL") + signo= SIGKILL; + + int ret = kill(-m_pid, signo); switch(ret) { case 0: logger.debug("Sent SIGTERM to pid %d", (int)-m_pid); diff --git a/ndb/test/include/CpcClient.hpp b/ndb/test/include/CpcClient.hpp index 1655bc57b56..8d8e079d219 100644 --- a/ndb/test/include/CpcClient.hpp +++ b/ndb/test/include/CpcClient.hpp @@ -56,6 +56,7 @@ public: BaseString m_stdout; BaseString m_stderr; BaseString m_ulimit; + BaseString m_shutdown_options; }; private: diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp index 842f658f5b6..0b0b7472a19 100644 --- a/ndb/test/run-test/main.cpp +++ b/ndb/test/run-test/main.cpp @@ -448,6 +448,7 @@ setup_config(atrt_config& config){ proc.m_proc.m_runas = proc.m_host->m_user; proc.m_proc.m_ulimit = "c:unlimited"; proc.m_proc.m_env.assfmt("MYSQL_BASE_DIR=%s", dir.c_str()); + proc.m_proc.m_shutdown_options = ""; proc.m_hostname = proc.m_host->m_hostname; proc.m_ndb_mgm_port = g_default_base_port; if(split1[0] == "mgm"){ @@ -470,6 +471,7 @@ setup_config(atrt_config& config){ proc.m_proc.m_path.assign(dir).append("/libexec/mysqld"); proc.m_proc.m_args = "--core-file --ndbcluster"; proc.m_proc.m_cwd.appfmt("%d.mysqld", index); + proc.m_proc.m_shutdown_options = "SIGKILL"; // not nice } else if(split1[0] == "api"){ proc.m_type = atrt_process::NDB_API; proc.m_proc.m_name.assfmt("%d-%s", index, "ndb_api"); diff --git a/ndb/test/src/CpcClient.cpp b/ndb/test/src/CpcClient.cpp index 1d1b4fcb977..4d06b4a7ff5 100644 --- a/ndb/test/src/CpcClient.cpp +++ b/ndb/test/src/CpcClient.cpp @@ -282,6 +282,7 @@ convert(const Properties & src, SimpleCpcClient::Process & dst){ b &= src.get("stdout", dst.m_stdout); b &= src.get("stderr", dst.m_stderr); b &= src.get("ulimit", dst.m_ulimit); + b &= src.get("shutdown", dst.m_shutdown_options); return b; } @@ -305,6 +306,7 @@ convert(const SimpleCpcClient::Process & src, Properties & dst ){ b &= dst.put("stdout", src.m_stdout.c_str()); b &= dst.put("stderr", src.m_stderr.c_str()); b &= dst.put("ulimit", src.m_ulimit.c_str()); + b &= dst.put("shutdown", src.m_shutdown_options.c_str()); return b; } @@ -372,6 +374,7 @@ SimpleCpcClient::list_processes(Vector &procs, Properties& reply) { CPC_ARG("stdout",String, Mandatory, "Redirect stdout"), CPC_ARG("stderr",String, Mandatory, "Redirect stderr"), CPC_ARG("ulimit",String, Mandatory, "ulimit"), + CPC_ARG("shutdown",String, Mandatory, "shutdown"), CPC_END() };