Commit: f55a0c1a5d9ce09594250a24bec6dbb0d55a5e18 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revisão: f55a0c1a5d9ce09594250a24bec6dbb0d55a5e18 (tree)
• Hora: 2013-05-14 13:33:15
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Mensagem de Log

thread id output to logfile for debug.

Mudança Sumário

• modified: doc/heartbeat-ra/sample.crm
• add: l7vsd/include/gettid.h
• modified: l7vsd/src/l7vsd.cpp
• modified: l7vsd/src/session_thread_control.cpp
• modified: l7vsd/src/virtualservice_tcp.cpp

Diff

--- a/doc/heartbeat-ra/sample.crm
+++ b/doc/heartbeat-ra/sample.crm
@@ -37,34 +37,34 @@ group grpUltraMonkey \
 ### Primitive Configuration ###
 primitive prmVIPcheck ocf:heartbeat:VIPcheck \
 	params \
-		target_ip="MODIFY_TARGET_VIP" \
+		target_ip="" \
 		count="1" \
 		wait="10" \
-	op start interval="0s" timeout="90s" on-fail="restart" start_delay="4s"
+	op start interval="0s" timeout="90s" on-fail="restart" start_delay="4s“
 
-primitive prmVIP ocf:heartbeat:IPaddr2 \
+primitive prmVIP1 ocf:heartbeat:IPaddr2 \
 	params \
-		ip="MODIFY_VIP_IP" \
-		nic="MODIFY_VIP_NIC" \
-		cidr_netmask="MODIFY_VIP_NETMASK" \
+		ip="" \
+		nic="" \
+		cidr_netmask="" \
 	op start interval="0s" timeout="60s" on-fail="restart" \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
-	op stop interval="0s" timeout="60s" on-fail="block"
+	op stop interval="0s" timeout="60s" on-fail="fence"
 
 primitive prmL7directord ocf:heartbeat:L7directord \
 	op start interval="0s" timeout="60s" on-fail="restart" \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
-	op stop interval="0s" timeout="60s" on-fail="block"
+	op stop interval="0s" timeout="60s" on-fail="fence"
 
 primitive prmL7vsd ocf:heartbeat:L7vsd \
 	op start interval="0s" timeout="60s" on-fail="restart" \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
-	op stop interval="0s" timeout="60s" on-fail="block"
+	op stop interval="0s" timeout="60s" on-fail="fence"
 
 primitive prmPingd ocf:pacemaker:pingd \
 	params \
 		name="default_ping_set" \
-		host_list="MODIFY_PING_TARGET_IP" \
+		host_list="" \
 		multiplier="100" \
 	op start interval="0s" timeout="60s" on-fail="restart" \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
@@ -73,7 +73,7 @@ primitive prmPingd ocf:pacemaker:pingd \
 primitive prmDiskd ocf:pacemaker:diskd \
 	params \
 		name="diskcheck_status_internal" \
-		device="MODIFY_TARGET_DISK_DEV" \
+		device="" \
 		interval="10" \
 	op start interval="0s" timeout="60s" on-fail="restart" \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
@@ -83,8 +83,8 @@ primitive prmDiskd ocf:pacemaker:diskd \
 #	params \
 #		priority="1" \
 #		stonith-timeout="40s" \
-#		hostlist="MODIFY_PRYMARY_HOST" \
-#		dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
+#		hostlist="" \
+#		dead_check_target="" \
 #		standby_check_command="/usr/sbin/crm_resource -r prmVIP -W | grep -q `hostname`" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="10s" timeout="60s" \
@@ -92,12 +92,12 @@ primitive prmDiskd ocf:pacemaker:diskd \
 
 #primitive prmStonith1-2 stonith:external/ipmi \
 #	params \
-#	       passwd="MODIFY_IPMI_PASSWORD" \
-#	       ipaddr="MODIFY_IPMI_IP" \
+#	       passwd="" \
+#	       ipaddr="" \
 #	       priority="2" \
-#	       userid="MODIFY_IPMI_USER" \
-#	       hostname="MODIFY_PRYMARY_HOST" \
-#	       interface="MODIFY_IPMI_INTERFACE" \
+#	       userid="" \
+#	       hostname="" \
+#	       interface="" \
 #	       stonith-timeout="60s" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="3600s" timeout="60s" \
@@ -107,7 +107,7 @@ primitive prmDiskd ocf:pacemaker:diskd \
 #	params \
 #		priority="3" \
 #		stonith-timeout="600s" \
-#		hostlist="MODIFY_PRYMARY_HOST" \
+#		hostlist="" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="3600s" timeout="60s" \
 #	op stop interval="0s" timeout="60s"
@@ -116,8 +116,8 @@ primitive prmDiskd ocf:pacemaker:diskd \
 #	params \
 #		priority="1" \
 #		stonith-timeout="40s" \
-#		hostlist="MODIFY_SECONDARY_HOST" \
-#		dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
+#		hostlist="" \
+#		dead_check_target="" \
 #		standby_check_command="/usr/sbin/crm_resource -r prmVIP -W | grep -q `hostname`" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="10s" timeout="60s" \
@@ -125,12 +125,12 @@ primitive prmDiskd ocf:pacemaker:diskd \
 
 #primitive prmStonith2-2 stonith:external/ipmi \
 #	params \
-#	       passwd="MODIFY_IPMI_PASSWORD" \
-#	       ipaddr="MODIFY_IPMI_IP" \
+#	       passwd="" \
+#	       ipaddr="" \
 #	       priority="2" \
-#	       userid="MODIFY_IPMI_USER" \
-#	       hostname="MODIFY_SECONDARY_HOST" \
-#	       interface="MODIFY_IPMI_INTERFACE" \
+#	       userid="" \
+#	       hostname="" \
+#	       interface="" \
 #	       stonith-timeout="60s" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="3600s" timeout="60s" \
@@ -140,21 +140,21 @@ primitive prmDiskd ocf:pacemaker:diskd \
 #	params \
 #		priority="3" \
 #		stonith-timeout="600s" \
-#		hostlist="MODIFY_SECONDARY_HOST" \
+#		hostlist="" \
 #	op start interval="0s" timeout="60s" \
 #	op monitor interval="3600s" timeout="60s" \
 #	op stop interval="0s" timeout="60s"
 
 ### Resource Location ###
 location rsc_location-grpUltraMonkey-1 grpUltraMonkey \
-	rule 200: #uname eq MODIFY_PRYMARY_HOST \
-	rule 100: #uname eq MODIFY_SECONDARY_HOST \
+	rule 200: #uname eq  \
+	rule 100: #uname eq  \
 	rule -INFINITY: not_defined default_ping_set or default_ping_set lt 100 \
 	rule -INFINITY: not_defined diskcheck_status_internal or diskcheck_status_internal eq ERROR
 #location rsc_location-grpStonith1-2 grpStonith1 \
-#	rule -INFINITY: #uname eq MODIFY_PRYMARY_HOST
+#	rule -INFINITY: #uname eq 
 #location rsc_location-grpStonith2-3 grpStonith2 \
-#	rule -INFINITY: #uname eq MODIFY_SECONDARY_HOST
+#	rule -INFINITY: #uname eq 
 
 ### Resource Colocation ###
 colocation rsc_colocation-grpUltraMonkey-clnPingd-1 INFINITY: grpUltraMonkey clnPingd

--- /dev/null
+++ b/l7vsd/include/gettid.h
@@ -0,0 +1,31 @@
+#ifndef GETTID_H
+#define GETTID_H
+
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+
+#include <boost/noncopyable.hpp>
+
+namespace l7vs
+{
+
+class get_tid : boost::noncopyable
+{
+public:
+        static pid_t gettid(void) {
+                return syscall(SYS_gettid);
+        };
+};
+
+/*
+extern "C"
+pid_t gettid(void)
+{
+        return syscall(SYS_gettid);
+}
+*/
+
+}
+
+#endif

--- a/l7vsd/src/l7vsd.cpp
+++ b/l7vsd/src/l7vsd.cpp
@@ -35,6 +35,7 @@
 #include "error_code.h"
 #include "snmpagent.h"
 #include "snmpfunc.h"
+#include "gettid.h"
 #define    PARAM_SCHED_ALGORITHM    "task_scheduler_algorithm"
 #define PARAM_SCHED_PRIORITY    "task_scheduler_priority"
 #define TRAP_TIME_STRING_MAX_SIZE   (20)
@@ -191,6 +192,9 @@ void    l7vsd::list_virtual_service_verbose(l7vsd_response *response, error_code
 //! @param[out]    error_code
 void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, error_code &err)
 {
+        pid_t tid;
+        tid = get_tid::gettid();
+
         Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 7, "l7vsd::add_virtual_service", __FILE__, __LINE__);
 
         boost::mutex::scoped_lock command_lock(command_mutex);
@@ -207,6 +211,7 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
         if (LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_MAINTHREAD)) {
                 std::stringstream    debugstr;
                 debugstr << "l7vsd::add_virtual_service arguments:";
+                debugstr << boost::format("tid=%d") % tid;
                 debugstr << boost::format("*in_vselement=%s") % *in_vselement;
                 Logger::putLogDebug(LOG_CAT_L7VSD_MAINTHREAD, 8, debugstr.str(), __FILE__, __LINE__);
         }
@@ -323,6 +328,9 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
 //! @param[out]    error_code
 void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, error_code &err)
 {
+        pid_t tid;
+        tid = get_tid::gettid();
+
         Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 9, "l7vsd::del_virtual_service", __FILE__, __LINE__);
 
         boost::mutex::scoped_lock command_lock(command_mutex);
@@ -339,6 +347,7 @@ void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, e
         if (LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_MAINTHREAD)) {
                 std::stringstream    debugstr;
                 debugstr << "l7vsd::del_virtual_service arguments:";
+                debugstr << boost::format("tid=%d") % tid;
                 debugstr << boost::format("*in_vselement=%s") % *in_vselement;
                 Logger::putLogDebug(LOG_CAT_L7VSD_MAINTHREAD, 10, debugstr.str(), __FILE__, __LINE__);
         }
@@ -1471,7 +1480,13 @@ std::string    l7vsd::usage()
 //! signal handler function
 void    l7vsd::sig_exit_handler()
 {
-        Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 40, "l7vsd::sig_exit_handler", __FILE__, __LINE__);
+        pid_t tid;
+        tid = get_tid::gettid();
+
+        std::stringstream debugstr;
+        debugstr << "l7vsd::sig_exit_handler ";
+        debugstr << boost::format("Thread id=%d") % tid;
+        Logger    logger(LOG_CAT_L7VSD_MAINTHREAD, 40, debugstr.str(), __FILE__, __LINE__);
 
         sigset_t    sigmask;
         sigemptyset(&sigmask);

--- a/l7vsd/src/session_thread_control.cpp
+++ b/l7vsd/src/session_thread_control.cpp
@@ -26,6 +26,7 @@
 #include "session_thread_control.h"
 
 #include "utility.h"
+#include "gettid.h"
 
 namespace l7vs
 {
@@ -66,8 +67,12 @@ void    session_thread_control::start_thread()
 //
 void    session_thread_control::upstream_run()
 {
+        pid_t tid;
+        tid = get_tid::gettid();
+
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
-                boost::format fmt("in_function : void session_thread_control::upstream_run()");
+                boost::format fmt("in_function[%d] : void session_thread_control::upstream_run()");
+                fmt % tid;
                 Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 1, fmt.str(), __FILE__, __LINE__);
         }
 
@@ -130,8 +135,12 @@ void    session_thread_control::upstream_run()
 //
 void    session_thread_control::downstream_run()
 {
+        pid_t tid;
+        tid = get_tid::gettid();
+
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
-                boost::format fmt("in_function : void session_thread_control::downstream_run()");
+                boost::format fmt("in_function[%d] : void session_thread_control::downstream_run()");
+                fmt % tid;
                 Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 4, fmt.str(), __FILE__, __LINE__);
         }
         cpu_set_t       mask;
@@ -293,7 +302,7 @@ void    session_thread_control::join()
         downthread_joining_condition.wait(down_lk);
 
         if (unlikely(LOG_LV_DEBUG == l7vs::Logger::getLogLevel(l7vs::LOG_CAT_L7VSD_VIRTUALSERVICE))) {
-                boost::format fmt("out_function : void session_thread_control::stopdownstream() : up_status = %d / down_status = %d");
+                boost::format fmt("out_function : void session_thread_control::join() : up_status = %d / down_status = %d");
                 fmt % upthread_state % downthread_state;
                 l7vs::Logger::putLogDebug(l7vs::LOG_CAT_L7VSD_VIRTUALSERVICE, 16, fmt.str(), __FILE__, __LINE__);
         }

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -38,6 +38,7 @@
 #include "snmpagent.h"
 #include "utility.h"
 #include "logger_access_manager.h"
+#include "gettid.h"
 
 // implementation for virtualservice_tcp
 /*!
@@ -1542,6 +1543,9 @@ void l7vs::virtualservice_tcp::del_realserver(const l7vs::virtualservice_element
  */
 void l7vs::virtualservice_tcp::run()
 {
+        pid_t tid;
+        tid = get_tid::gettid();
+
         Logger funcLog(LOG_CAT_L7VSD_VIRTUALSERVICE, 80, "function: void virtualservice_tcp::run()",
                        __FILE__, __LINE__);
 
@@ -1619,6 +1623,13 @@ void l7vs::virtualservice_tcp::run()
         schedmod_rep_timer->async_wait(boost::bind(&virtualservice_tcp::handle_schedmod_replication,
                                        this, boost::asio::placeholders::error));
 
+        if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
+                boost::format formatter("function: void virtualservice_tcp::run() "
+                                        "thread id = %d");
+                formatter % tid;
+                Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 82, formatter.str(), __FILE__, __LINE__);
+        }
+
         //run dispatcher(start io_service loop)
         work.reset(new boost::asio::io_service::work(*dispatcher));
         boost::thread_group dispatcher_thread_group;