提交: a43097d3ea8f47bded1069a3b9adb332c0c502f7 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: a43097d3ea8f47bded1069a3b9adb332c0c502f7 (tree)
• 時間: 2014-06-16 17:44:00
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'master' of file:///var/www/html/ultramonkey-l7-v3.git

Change Summary

• modified: CHANGES
• modified: configure.in
• modified: doc/heartbeat-ra/L7directord
• modified: doc/heartbeat-ra/L7vsd
• modified: l7vsd/include/virtualservice.h
• modified: l7vsd/src/l7vsd.cpp
• modified: l7vsd/src/virtualservice_tcp.cpp
• modified: ultramonkeyl7.spec

差異

--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+[Mar. 9 2014] 3.1.1-1 HIBARI Michiro, Hiroaki Nakano
+  - #33102 fix memory leak.
+  - #33255 fix accessing endpoint at deleted realserver.
+
 [Sep. 8 2012] 3.1.0-1 HIBARI Michiro, Hiroaki Nakano
   - Add "session_thread_pool_size" option for l7vsadm and l7directord.
   - Change spec file. Make devel package.

--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 AC_INIT(l7vsd)
 PACKAGENAME=l7vsd
-VERSION=3.1.0
+VERSION=3.1.1
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
 AC_CONFIG_SRCDIR([config.h.in])

--- a/doc/heartbeat-ra/L7directord
+++ b/doc/heartbeat-ra/L7directord
@@ -145,6 +145,12 @@ l7directord_status(){
 # Get Resource Monitor Method
 ###############################
 l7directord_monitor() {
+	local loglevel
+	loglevel=${1:-err}
+	if ocf_is_probe; then
+		loglevel="info"
+	fi
+
 	isRunning;
 	RET=$?
 	if [ $RET -eq 1 ]; then
@@ -158,7 +164,7 @@ l7directord_monitor() {
 		fi
 	elif [ $RET -eq 0 ]; then
 		MSG="l7direcotrd is not running."
-		outputLog err ${OCF_NOT_RUNNING} ${MSG}
+		outputLog $loglevel ${OCF_NOT_RUNNING} ${MSG}
 		return ${OCF_NOT_RUNNING}
 	fi
 	MSG="l7direcotrd does not work. (ps=$RET) "
@@ -171,7 +177,7 @@ l7directord_monitor() {
 ###############################
 l7directord_start() {
 	outputLog info "l7directord is starting ..."
-	l7directord_monitor
+	l7directord_monitor info
 	RET=$?
 	if [ $RET -eq ${OCF_SUCCESS} ]; then
 		MSG="l7directord is already running."

--- a/doc/heartbeat-ra/L7vsd
+++ b/doc/heartbeat-ra/L7vsd
@@ -67,7 +67,7 @@ END
 ###############################
 l7vsd_start() {
         ocf_log info "l7vsd is starting ..."
-        l7vsd_monitor
+        l7vsd_monitor info
         RET=$?
         if [ $RET -eq $OCF_SUCCESS ]; then
                 ocf_log info "l7vsd is already running."
@@ -182,6 +182,12 @@ l7vsd_status(){
 # Get Resource Monitor Method
 ###############################
 l7vsd_monitor() {
+	local loglevel
+	loglevel=${1:-err}
+	if ocf_is_probe; then
+		loglevel="info"
+	fi
+
 	isRunning;
 	RET=$?
 	if [ $RET -eq 1 ]; then
@@ -195,7 +201,7 @@ l7vsd_monitor() {
 		fi
 	elif [ $RET -eq 0 ]; then
 		MSG="l7vsd is not running."
-		outputLog err ${OCF_NOT_RUNNING} ${MSG}
+		outputLog $loglevel ${OCF_NOT_RUNNING} ${MSG}
 		return $OCF_NOT_RUNNING
 	fi
 	MSG="l7vsd does not work. (ps=$RET) "

--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -621,6 +621,8 @@ public:
         void run();
         void stop();
 
+        boost::shared_ptr<boost::thread> vs_thread_ptr;
+
         void connection_active(const boost::asio::ip::tcp::endpoint &);
         void connection_inactive(const boost::asio::ip::tcp::endpoint &);
         void release_session(const tcp_session *session_ptr);

--- a/l7vsd/src/l7vsd.cpp
+++ b/l7vsd/src/l7vsd.cpp
@@ -254,7 +254,7 @@ void    l7vsd::add_virtual_service(const virtualservice_element *in_vselement, e
                 try {
 
                         // create thread and run
-                        vs_threads.create_thread(boost::bind(&virtual_service::run, vsptr));
+                        (*vsptr).vs_thread_ptr =  boost::shared_ptr<boost::thread>(vs_threads.create_thread(boost::bind(&virtual_service::run, vsptr)));
 
                 } catch (...) {
                         std::stringstream    buf;
@@ -357,6 +357,8 @@ void    l7vsd::del_virtual_service(const virtualservice_element *in_vselement, e
         if (vslist.end() !=  vsitr) {
                 // vs stop
                 (*vsitr)->stop();
+                (*vsitr)->vs_thread_ptr->join();
+                vs_threads.remove_thread((*vsitr)->vs_thread_ptr.get());
                 // vs finalize
                 (*vsitr)->finalize(err);
 
@@ -800,14 +802,14 @@ void    l7vsd::flush_virtual_service(error_code &err)
 
                         // vs stop
                         (*itr)->stop();
+                        // join virtualservice threads
+                        (*itr)->vs_thread_ptr->join();
+                        vs_threads.remove_thread((*itr)->vs_thread_ptr.get());
                         // vs finalize
                         (*itr)->finalize(err);
                 }
         }
 
-        // join virtualservice threads
-        vs_threads.join_all();
-
         // replication switch to slave
         rep->switch_to_slave();
 }

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -936,12 +936,10 @@ void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
                                             __FILE__, __LINE__);
                 }
         }
-        //waiting session delete
-        delete waiting_session;
-        waiting_session = NULL;
-
-        //waiting thread delete
+        //release waiting session
         waiting_stc->join();
+        delete waiting_stc;
+        waiting_stc = NULL;
 
         //unload ProtocolModule
         if (protomod) {
@@ -1531,8 +1529,9 @@ void l7vs::virtualservice_tcp::del_realserver(const l7vs::virtualservice_element
                 for (std::list<realserver>::iterator rs_itr = rs_list.begin();
                      rs_itr != rs_list.end(); ++rs_itr) {
                         if (itr->tcp_endpoint == rs_itr->tcp_endpoint) {
+                                boost::asio::ip::tcp::endpoint del_endpoint = rs_itr->tcp_endpoint;
                                 rs_list.erase(rs_itr);
-                                active_sessions.do_all(boost::bind(&session_thread_control::session_realserver_remove, _1, rs_itr->tcp_endpoint));
+                                active_sessions.do_all(boost::bind(&session_thread_control::session_realserver_remove, _1, del_endpoint));
                                 break;
                         }
                 }

--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -6,7 +6,7 @@ Name:		%define l7vs_moddir	%{_libdir}/l7vs
 
 Summary: The Layer-7 Virtual Server
 Name: ultramonkeyl7
-Version: 3.1.0
+Version: 3.1.1
 Release: 1%{?dist}
 License: LGPLv2.1
 Group: System Environment/Daemons
@@ -133,6 +133,14 @@ fi
 %{moduledevel_tempdir}/*
 
 %changelog
+* Fri Mar 7 2014 Hiroaki Nakano <[e-mail]> 3.1.1-1
+- Update for 3.1.1-1
+- Marge from 3.1.1-devel to master. And modefy version.
+
+* Fri Feb 7 2014 Hiroaki Nakano <[e-mail]> 3.1.1-devel
+- Update for 3.1.1-devel
+- Bugfix
+
 * Sat Sep 8 2012 HIBARI Michiro  <[e-mail]> 3.1.0-devel
 - Update for 3.1.0-devel
 - Change spec file for generate devel package.