UltraMonkey-L7中野個人パッチ

Fork

Merge branch 'master' into for_fedora19

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

Modify CHANGES and spec file for v3.1.1-1.


Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Merge branch 'fix_memory_leak' into v3.1.1-devel

Merge branch 'modify_del_rs_code' into v3.1.1-devel

Fix ticket #33102 (fix memory reak).

Fix ticket #33255 (modify delete realserver code).

fix ticket #33102 (fix memory reak).

Merge branch 'del_vs_thread' into v3.1.1-devel

bug fix

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

#xxxxx virtual serviceスレッドのVS削除時の終了と削除

l7directord stopによってVirtual Service削除されたあとも
Virtual Serviceスレッドが終了・削除されないため、
l7directord restartを繰り返すとメモリリークを起こしていたのを
修正。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Merge branch 'fix_invalid_rs_endpoint' into v3.1.1-devel

Update Version and CHANGELOG

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Merge branch 'fix_invalid_rs_endpoint' into v3.1.1-devel

Merge branch 'del_vs_thread' into v3.1.1-devel

xxxxx 不正なendpointへのアクセスの修正

RealServerオブジェクトを削除後にメンバのendpointへアクセス
している箇所があるので、修正。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

reverse commit.

#xxxxx virtual serviceスレッドのVS削除時の終了と削除

l7directord stopによってVirtual Service削除されたあとも
Virtual Serviceスレッドが終了・削除されないため、
l7directord restartを繰り返すとメモリリークを起こしていたのを
修正。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Update Version and CHANGELOG

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Merge branch 'ra-loglevel-modify' of git.sourceforge.jp:/gitroot/ultramonkey-l7/ultramonkey-l7-v3 into v3.1.1-devel

Fix memory leak

This memory leak caused by
https://sourceforge.jp/projects/ultramonkey-l7/scm/git/ultramonkey-l7-v3/commits/6f2218216860555ecf2243cdc51758a0e9a2f614

waiting_stc not deleted.

Change of the output level of the log of the resource agents.

The resource agents of L7vsd and L7directord outputs error log
every time in probe,start.

Dec 20 15:44:19 LB01 L7directord(prmL7directord)[9900]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7directord monitor] NG;return=7 l7direcotrd is not running.
Dec 20 15:44:19 LB01 L7vsd(prmL7vsd:0)[9913]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7vsd monitor] NG;return=7 l7vsd is not running.
Dec 20 15:44:24 LB01 L7vsd(prmL7vsd:0)[9984]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7vsd start] NG;return=7 l7vsd is not running.
Dec 20 15:44:34 LB01 L7directord(prmL7directord)[10963]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7directord start] NG;return=7 l7direcotrd is not running.

When a resource does not start, the resource agent changes the level of the log and should output it.

#32548: systemd設定ファイル

RHEL7からデーモン起動がsystemdになるのに対応するため、fedoraでl7vsdとl7directordのsystemd設定ファイルを作成。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

#32547: fedora, RHEL7コンパイルエラー対処

TIME_UTCの仕様変更対処、pthreadがリンクされず
リンカエラーとなることへの対処。
ついでに、autotoolsバージョンアップによる
AC_INITとAM_INIT_AUTOMAKEの仕様変更対処。

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

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

Conflicts:
README
doc/man/l7directord.8
doc/man/l7vsadm.8
l7directord/Makefile.am
l7directord/l7directord
l7vsd/init.d/Makefile.am
l7vsd/module/protocol/protocol_module_ip.cpp
l7vsd/module/protocol/protocol_module_sessionless.cpp
l7vsd/src/l7vsd.cpp
l7vsd/src/session_thread_control.cpp
l7vsd/src/virtualservice_tcp.cpp
ultramonkeyl7.spec

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>

Merge branch 'v3.1.0-devel'

Merge branch 'TIME_UTC_fix'

Merge branch 'for_gcc4.7'

Merge branch 'v3.1.0-devel'

Fix reschedule error.

Signed-off-by: Hiroaki Nakano <nakano.hiroaki@nttcom.co.jp>