提交: a25ac81183f94e01b6face1db6e06ae210f0df92 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: a25ac81183f94e01b6face1db6e06ae210f0df92 (tree)
• 時間: 2013-07-05 11:31:00
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'v3.1.0-devel' into gettid_for_debug

Change Summary

• modified: CHANGES
• modified: l7directord/init.d/l7directord
• modified: l7vsd/include/session_thread_control.h
• modified: l7vsd/include/virtualservice.h
• modified: l7vsd/init.d/l7vsd
• modified: l7vsd/module/protocol/protocol_module_ip.cpp
• modified: l7vsd/module/protocol/protocol_module_ip.h
• modified: l7vsd/module/protocol/protocol_module_sessionless.cpp
• modified: l7vsd/src/l7vsadm.cpp
• modified: l7vsd/src/logger_impl.cpp
• modified: l7vsd/src/session_thread_control.cpp
• modified: l7vsd/src/tcp_session.cpp
• modified: l7vsd/src/virtualservice_base.cpp
• modified: l7vsd/src/virtualservice_tcp.cpp

差異

--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,19 @@
-[Sep. 8 2012] 3.1.0-1 HIBARI Michiro
+[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.
   - Fixed bug: Evaluated the header section with the body section in HTTP negotiate check.
   - Add "server_connect_timeout" option at l7vsd.cf.
+  - #30844 Fixed man isn't installed.
+  - #30845 Fixed config file of log-rotation isn't installed. 
+  - #30846 Add CRM sample file for Pacemaker.
+  - #30847 Support cross operation on Pacemaker. 
+  - #30993 Fixed compailing error of gcc4.6.
+  - #31199 Fixed remaining threads when deleted virtual service.
+  - #31200 Fixed segmantaion fault when deleted virtual service.
+  - #31545 Fixed bulding error of boost 1.50 upper.
+
+[Dec. 12 2012] 3.0.4-3 Hiroaki Nakano
+  - Fixed breaking HTTP header over MAX_BUFFER_SIZE on ip module.(#30300 patch)
 
 [Aug. 30 2012] 3.0.4-2 Hiroaki Nakano
   - Fixed LogLevel at #29144 patch.

--- a/l7directord/init.d/l7directord
+++ b/l7directord/init.d/l7directord
@@ -39,6 +39,7 @@ case "$1" in
   start)
         action "Starting l7directord ... " /usr/sbin/l7directord start
 	if [ $? -eq 0 ]; then
+	    mkdir -p `dirname $LOCKFILE`
 	    touch $LOCKFILE
 	fi
 	;;

--- a/l7vsd/include/session_thread_control.h
+++ b/l7vsd/include/session_thread_control.h
@@ -120,7 +120,7 @@ public:
         }
 
         //! create up down thread
-        void start_thread();
+        int start_thread();
 
         //! session shared ptr getter
         //! @return session shared ptr

--- 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/init.d/l7vsd
+++ b/l7vsd/init.d/l7vsd
@@ -39,6 +39,7 @@ start() {
     else
 	echo "done."
 	pidof $PROG > $PIDFILE
+	mkdir -p `dirname $LOCKFILE`
 	touch $LOCKFILE
     fi
 

--- a/l7vsd/module/protocol/protocol_module_ip.cpp
+++ b/l7vsd/module/protocol/protocol_module_ip.cpp
@@ -324,7 +324,6 @@ protocol_module_base::check_message_result protocol_module_ip::check_parameter(c
         bool timeout_flag = false;
         bool reschedule_flag = false;
         bool no_reschedule_flag = false;
-        bool forward_checked = false;
         bool sorryuri_checked = false;
         bool stats_checked = false;
 
@@ -447,11 +446,6 @@ protocol_module_base::check_message_result protocol_module_ip::check_parameter(c
                                         break;
                                 }
                         }
-                        //option string = "-F"
-                        else if (*it == "-F" || *it == "--forwarded-for") {
-                                //set forward flag  ON
-                                forward_checked = true;
-                        }
                         //option string = "-S"
                         else if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF
@@ -5657,11 +5651,6 @@ bool protocol_module_ip::put_data_into_sendbuffer(
                         buffer_element.first += sendbuffer_rest_size;
                         buffer_element.second -= sendbuffer_rest_size;
                         sendbuffer_rest_size = 0;
-
-                        //add remain item
-                        data_ptr->buffer_sequence.push_back(buffer_element);
-                        //delete the item
-                        data_ptr->buffer_sequence.pop_front();
                         break;
                 }
         }

--- a/l7vsd/module/protocol/protocol_module_ip.h
+++ b/l7vsd/module/protocol/protocol_module_ip.h
@@ -93,8 +93,8 @@ protected:
                         hash = cl_endpoint.address().to_v4().to_ulong() * GOLDEN_RATIO_PRIME;
                 } else {
                         boost::asio::ip::address_v6::bytes_type v6_bytes = cl_endpoint.address().to_v6().to_bytes();
-                        boost::asio::ip::address_v4::bytes_type v4_bytes = {{v6_bytes[12], v6_bytes[13], v6_bytes[14], v6_bytes[15]}};
-                        boost::asio::ip::address_v4::address_v4 v4_address = boost::asio::ip::address_v4::address_v4(v4_bytes);
+                        const boost::asio::ip::address_v4::bytes_type v4_bytes = {{v6_bytes[12], v6_bytes[13], v6_bytes[14], v6_bytes[15]}};
+                        boost::asio::ip::address_v4 v4_address(v4_bytes);
                         hash = v4_address.to_ulong() * GOLDEN_RATIO_PRIME;
 
                 }

--- a/l7vsd/module/protocol/protocol_module_sessionless.cpp
+++ b/l7vsd/module/protocol/protocol_module_sessionless.cpp
@@ -356,7 +356,6 @@ protocol_module_base::check_message_result protocol_module_sessionless::check_pa
         //set check result true
         check_message_result check_result;
         check_result.flag = true;
-        bool forward_checked = false;
         bool sorryuri_checked = false;
         bool stats_checked = false;
 
@@ -405,13 +404,8 @@ protocol_module_base::check_message_result protocol_module_sessionless::check_pa
                 vec_str_it it_end = args.end();
                 //loop option strings
                 for (; it != it_end; ++it) {
-                        //option string = "-F"
-                        if (*it == "-F" || *it == "--forwarded-for") {
-                                //set forward flag  ON
-                                forward_checked = true;
-                        }
                         //option string = "-S"
-                        else if (*it == "-S" || *it == "--sorry-uri") {
+                        if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF
                                 if (!sorryuri_checked) {
                                         //next item exist

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -2993,14 +2993,14 @@ bool l7vs::l7vsadm::execute(int argc, char *argv[])
         set_parameter();
 
         // Get l7vsadm execute file path from /proc/(pid)/exe (symbolic link)
+        ssize_t ret;
         char l7vsadm_file_path[256];
-        ssize_t retsize;
         memset(l7vsadm_file_path, 0, sizeof(l7vsadm_file_path));
-        retsize = readlink("/proc/self/exe", l7vsadm_file_path, sizeof(l7vsadm_file_path));
+        ret = readlink("/proc/self/exe", l7vsadm_file_path, sizeof(l7vsadm_file_path));
 
         // L7vsadm command conflict check. (Try l7vsadm execute file lock)
         file_lock lock(l7vsadm_file_path, l7vsadm_err);
-        if (l7vsadm_err) {
+        if (l7vsadm_err || ret == -1) {
                 std::cerr << "COMMON ERROR: " << l7vsadm_err.get_message() << std::endl;
                 Logger::putLogError(LOG_CAT_L7VSADM_COMMON, 2, l7vsadm_err.get_message(), __FILE__, __LINE__);
                 return false;
@@ -3039,7 +3039,12 @@ bool l7vs::l7vsadm::execute(int argc, char *argv[])
 
                         // Lock retrying.
                         boost::xtime xt;
+#if BOOST_VERSION >= 105000
+                        xtime_get(&xt, boost::TIME_UTC_);
+#else
                         xtime_get(&xt, boost::TIME_UTC);
+#endif
+
                         xt.sec += command_wait_interval;
                         boost::thread::sleep(xt);
                 }

--- a/l7vsd/src/logger_impl.cpp
+++ b/l7vsd/src/logger_impl.cpp
@@ -343,9 +343,8 @@ bool l7vs::LoggerImpl::init()
         }
 
         // get hostname
-        int        ret = 0;
         char    buff[HOST_NAME_MAX];
-        ret = gethostname(buff, HOST_NAME_MAX);
+        gethostname(buff, HOST_NAME_MAX);
         hostname = buff;
 
         initialized = true;

--- a/l7vsd/src/session_thread_control.cpp
+++ b/l7vsd/src/session_thread_control.cpp
@@ -34,18 +34,18 @@ namespace l7vs
 //
 //!    @brief create up down thread
 //
-void    session_thread_control::start_thread()
+int    session_thread_control::start_thread()
 {
 
-        int            int_val;
-
         upthread.reset(new boost::thread(&session_thread_control::upstream_run, this));        //! upstream thread create
         downthread.reset(new boost::thread(&session_thread_control::downstream_run, this));    //! downstream thread create
 
         //pthread_setschedparam
         int    retval, sched_policy;
         sched_param    scheduler_param;
-        int_val    = pthread_getschedparam(upthread->native_handle(), &sched_policy, &scheduler_param);
+        retval    = pthread_getschedparam(upthread->native_handle(), &sched_policy, &scheduler_param);
+        if (retval != 0) return retval;
+
         if (SCHED_FIFO == sched_algorithm) {
                 scheduler_param.__sched_priority    = sched_priority;
                 sched_policy    = SCHED_FIFO;
@@ -57,9 +57,12 @@ void    session_thread_control::start_thread()
         }
         if (0 <= sched_algorithm) {
                 retval            = pthread_setschedparam(upthread->native_handle(), sched_algorithm, &scheduler_param);
+                if (retval != 0 ) return retval;
                 retval            = pthread_setschedparam(downthread->native_handle(), sched_algorithm, &scheduler_param);
+                if (retval != 0 ) return retval;
         }
 
+        return retval;
 }
 
 //
@@ -108,7 +111,12 @@ void    session_thread_control::upstream_run()
                 if (state == WAIT) {    // after create or session end. this thread is pooling mode
                         boost::mutex::scoped_lock    lock(upthread_condition_mutex);
                         boost::xtime    wait;
+#if BOOST_VERSION >= 105000
+                        boost::xtime_get(&wait, boost::TIME_UTC_);
+#else
                         boost::xtime_get(&wait, boost::TIME_UTC);
+#endif
+
                         wait.sec += 1;
                         upthread_running_mutex.unlock();
                         upthread_condition.timed_wait(lock, wait);   // thread is condition wait( start at notify_all() )
@@ -175,7 +183,12 @@ void    session_thread_control::downstream_run()
                         boost::mutex::scoped_lock    lock(downthread_condition_mutex);
 //             downthread_condition.wait( lock ); // thread is condition wait( start at notify_all() )
                         boost::xtime    wait;
+#if BOOST_VERSION >= 105000
+                        boost::xtime_get(&wait, boost::TIME_UTC_);
+#else
                         boost::xtime_get(&wait, boost::TIME_UTC);
+#endif
+
                         wait.sec += 1;
                         downthread_running_mutex.unlock();
                         downthread_condition.timed_wait(lock, wait);   // thread is condition wait( start at notify_all() )

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -822,7 +822,12 @@ void tcp_session::up_thread_run()
                                 }       //message alive end.
                                 if (ssl_flag && up_thread_next_call_function.first == UP_FUNC_CLIENT_ACCEPT_EVENT) {     //handshake timeout check
                                         boost::xtime    now_time;
+#if BOOST_VERSION >= 105000
+                                        boost::xtime_get(&now_time, boost::TIME_UTC_);
+#else
                                         boost::xtime_get(&now_time, boost::TIME_UTC);
+#endif
+
                                         if ((now_time.sec - start_handshake_time.sec) > ssl_handshake_time_out) {        // timeout detect.
                                                 boost::system::error_code error_code;
                                                 client_ssl_socket.close(error_code);
@@ -1123,7 +1128,12 @@ void tcp_session::up_thread_client_accept(const TCP_PROCESS_TYPE_TAG process_typ
         if (ssl_flag) {
                 upthread_status = UPTHREAD_LOCK;
                 // try ssl handshake
+#if BOOST_VERSION >= 105000
+                boost::xtime_get(&start_handshake_time, boost::TIME_UTC_);
+#else
                 boost::xtime_get(&start_handshake_time, boost::TIME_UTC);
+#endif
+
                 client_ssl_socket.setoption(error_code);
                 client_ssl_socket.async_handshake(boost::bind(&tcp_session::up_thread_client_handshake_handle,
                                                   this,
@@ -4192,7 +4202,12 @@ void tcp_session::down_thread_sorryserver_handle_async_read_some(tcp_session::TC
 //! milliseconds to boost::xtime converter
 void tcp_session::to_time(int in, boost::xtime &xt)
 {
+#if BOOST_VERSION >= 105000
+        boost::xtime_get(&xt, boost::TIME_UTC_);
+#else
         boost::xtime_get(&xt, boost::TIME_UTC);
+#endif
+
         xt.sec += (in / 1000);
         xt.nsec += (in % 1000) * 1000000;
         if (xt.nsec >= 1000000000) {

--- a/l7vsd/src/virtualservice_base.cpp
+++ b/l7vsd/src/virtualservice_base.cpp
@@ -481,7 +481,7 @@ cpu_set_t    l7vs::virtualservice_base::get_cpu_mask(std::string    nic_name)
         map< size_t, string >    cpu_nic_map;
         string                    buff;
         ifstream                ifs("/proc/interrupts");
-        unsigned int            target_interrupt;
+        //unsigned int            target_interrupt;
         size_t                    target_cpuid = 0;
         cpu_set_t                mask;
         sched_getaffinity(0, sizeof(cpu_set_t), &mask);
@@ -503,7 +503,8 @@ cpu_set_t    l7vs::virtualservice_base::get_cpu_mask(std::string    nic_name)
                 algorithm::split(split_vec, buff, algorithm::is_any_of(":"));
                 if (!split_vec.size()) return mask;     // cannot split interrupt
                 algorithm::trim(split_vec[0]);
-                target_interrupt = lexical_cast<unsigned int>(split_vec[0]);
+                //target_interrupt = lexical_cast<unsigned int>(split_vec[0]);
+                lexical_cast<unsigned int>(split_vec[0]);
                 for (size_t i = 0; i < cpu_nic_map.size(); ++i) {
                         size_t    start_position = 4 + (i * 11);
                         size_t    end_position = 11;

--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -30,6 +30,7 @@
 #include <boost/format.hpp>
 #include <sys/socket.h>
 #include <linux/version.h>
+#include <pthread.h>
 
 #include "virtualservice.h"
 #include "logger_enum.h"
@@ -433,6 +434,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(
@@ -503,6 +505,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");
@@ -551,6 +554,8 @@ void l7vs::virtualservice_tcp::handle_accept(const l7vs::session_thread_control
  */
 void l7vs::virtualservice_tcp::initialize(l7vs::error_code &err)
 {
+        int ret = 0;
+
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
                 boost::format formatter("in_function: void virtualservice_tcp::initialize( "
                                         "l7vs::error_code& err )");
@@ -833,7 +838,16 @@ void l7vs::virtualservice_tcp::initialize(l7vs::error_code &err)
                                 session_thread_control *p_stc = new session_thread_control(
                                         sess, vsnic_cpumask, rsnic_cpumask, -1);
 
-                                p_stc->start_thread();
+                                ret = p_stc->start_thread();
+                                if (ret == ESRCH) {
+                                        continue;
+                                } else if (ret == EPERM) {
+                                        //Error
+                                        Logger::putLogError(LOG_CAT_L7VSD_VIRTUALSERVICE, 999, "Not super user authority",
+                                                            __FILE__, __LINE__);
+                                        err.setter(true, "set pthread schedule parameter.");
+                                        throw;
+                                }
                                 while (!pool_sessions.push(p_stc)) {}
                         } catch (...) {
                                 Logger::putLogFatal(
@@ -889,6 +903,7 @@ void l7vs::virtualservice_tcp::initialize(l7vs::error_code &err)
  */
 void l7vs::virtualservice_tcp::finalize(l7vs::error_code &err)
 {
+
         if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_VIRTUALSERVICE))) {
                 boost::format formatter("in_function: void virtualservice_tcp::finalize( "
                                         "l7vs::error_code& err )");
@@ -915,7 +930,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__);
@@ -925,6 +940,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
@@ -1595,6 +1613,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(),
@@ -1640,11 +1659,6 @@ void l7vs::virtualservice_tcp::run()
 
         //join dispatcher_thread_group when virtualservice_tcp::stop() executed.
         dispatcher_thread_group.join_all();
-
-        //stop all active sessions
-        {
-                active_sessions.do_all(boost::bind(&session_thread_control::session_stop, _1));
-        }
 }
 
 /*!