Commit: 28b420eca59093f563ed9bbb1250e3cccea366dd - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revisión: 28b420eca59093f563ed9bbb1250e3cccea366dd (tree)
• Tiempo: 2013-05-14 13:16:02
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

#31199: VS削除でもスレッドが残る

Cambiar Resumen

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

Diferencia incremental

--- 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

--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -451,6 +451,8 @@ protected:
         session_map_type            active_sessions;
         l7vs::atomic<unsigned long long>
         active_count;
+        session_thread_control      *waiting_stc;
+        //! session_thread_control waiting accept
 
         bool                        defer_accept_opt;
         //! is set option TCP_DEFER_ACCEPT

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -432,6 +432,7 @@ void l7vs::virtualservice_tcp::handle_accept(const l7vs::session_thread_control
         stc_ptr_noconst->session_access_log_output_mode_change(access_log_flag);
 
         active_sessions.insert(tmp_session, stc_ptr_noconst);
+        waiting_stc = NULL;
 
         //check sorry flag and status
         if (unlikely(
@@ -502,6 +503,7 @@ void l7vs::virtualservice_tcp::handle_accept(const l7vs::session_thread_control
         boost::mutex::scoped_lock down_wait_lk(stc_ptr_register_accept->get_downthread_mutex());
 
         waiting_session = stc_ptr_register_accept->get_session().get();
+        waiting_stc = stc_ptr_register_accept;
 
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
                 boost::format fmt1("active session thread id = %d");
@@ -914,7 +916,7 @@ void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
                 delete stc;
                 stc = NULL;
                 if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
-                        boost::format fmt("join pool session: pool_sessions.size = %d");
+                        boost::format fmt("join pool session: pool_session.size = %d");
                         fmt % pool_sessions.size();
                         Logger::putLogDebug(LOG_CAT_L7VSD_VIRTUALSERVICE, 55, fmt.str(),
                                             __FILE__, __LINE__);
@@ -924,6 +926,9 @@ void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
         delete waiting_session;
         waiting_session = NULL;
 
+        //waiting thread delete
+        waiting_stc->join();
+
         //unload ProtocolModule
         if (protomod) {
                 //finalize ProtocolModule
@@ -1591,6 +1596,7 @@ void l7vs::virtualservice_tcp::run()
         } while (!stc_ptr);
 
         waiting_session  = stc_ptr->get_session().get();
+        waiting_stc = stc_ptr;
 
         if (!ssl_virtualservice_mode_flag) {
                 acceptor_->async_accept(waiting_session->get_client_socket().get_socket(),