Commit: 9f20157953fa9286cc400af2ba10f8bc38a2e800 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revisão: 9f20157953fa9286cc400af2ba10f8bc38a2e800 (tree)
• Hora: 2013-06-25 11:26:10
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Mensagem de Log

RHEL6.1上コンパイルエラー対処

#30993 の対処をいれると、RHEL6.1上では返り値が使われていない
というエラーが出るため、対処。

CHANGESを更新

sample.crmのレビューコメント対応

Signed-off-by: Hiroaki Nakano <[e-mail]>

Mudança Sumário

• modified: CHANGES
• modified: doc/heartbeat-ra/sample.crm
• modified: l7vsd/src/l7vsadm.cpp

Diff

--- 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/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="" \
+		target_ip="MODIFY_TARGET_VIP" \
 		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 prmVIP1 ocf:heartbeat:IPaddr2 \
+primitive prmVIP ocf:heartbeat:IPaddr2 \
 	params \
-		ip="" \
-		nic="" \
-		cidr_netmask="" \
+		ip="MODIFY_VIP_IP" \
+		nic="MODIFY_VIP_NIC" \
+		cidr_netmask="MODIFY_VIP_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="fence"
+	op stop interval="0s" timeout="60s" on-fail="block"
 
 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="fence"
+	op stop interval="0s" timeout="60s" on-fail="block"
 
 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="fence"
+	op stop interval="0s" timeout="60s" on-fail="block"
 
 primitive prmPingd ocf:pacemaker:pingd \
 	params \
 		name="default_ping_set" \
-		host_list="" \
+		host_list="MODIFY_PING_TARGET_IP" \
 		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="" \
+		device="MODIFY_TARGET_DISK_DEV" \
 		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="" \
-#		dead_check_target="" \
+#		hostlist="MODIFY_PRYMARY_HOST" \
+#		dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
 #		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="" \
-#	       ipaddr="" \
+#	       passwd="MODIFY_IPMI_PASSWORD" \
+#	       ipaddr="MODIFY_IPMI_IP" \
 #	       priority="2" \
-#	       userid="" \
-#	       hostname="" \
-#	       interface="" \
+#	       userid="MODIFY_IPMI_USER" \
+#	       hostname="MODIFY_PRYMARY_HOST" \
+#	       interface="MODIFY_IPMI_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="" \
+#		hostlist="MODIFY_PRYMARY_HOST" \
 #	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="" \
-#		dead_check_target="" \
+#		hostlist="MODIFY_SECONDARY_HOST" \
+#		dead_check_target="MODIFY_TARGET_IP MODIFY_TARGET_IP ..." \
 #		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="" \
-#	       ipaddr="" \
+#	       passwd="MODIFY_IPMI_PASSWORD" \
+#	       ipaddr="MODIFY_IPMI_IP" \
 #	       priority="2" \
-#	       userid="" \
-#	       hostname="" \
-#	       interface="" \
+#	       userid="MODIFY_IPMI_USER" \
+#	       hostname="MODIFY_SECONDARY_HOST" \
+#	       interface="MODIFY_IPMI_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="" \
+#		hostlist="MODIFY_SECONDARY_HOST" \
 #	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  \
-	rule 100: #uname eq  \
+	rule 200: #uname eq MODIFY_PRYMARY_HOST \
+	rule 100: #uname eq MODIFY_SECONDARY_HOST \
 	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 
+#	rule -INFINITY: #uname eq MODIFY_PRYMARY_HOST
 #location rsc_location-grpStonith2-3 grpStonith2 \
-#	rule -INFINITY: #uname eq 
+#	rule -INFINITY: #uname eq MODIFY_SECONDARY_HOST
 
 ### Resource Colocation ###
 colocation rsc_colocation-grpUltraMonkey-clnPingd-1 INFINITY: grpUltraMonkey clnPingd

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -2993,13 +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];
         memset(l7vsadm_file_path, 0, sizeof(l7vsadm_file_path));
-        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;