コミット: 5e9c4a68ee73d49bd931b6d36dbaf9fd87c1289b - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

コミットメタ情報

• リビジョン: 5e9c4a68ee73d49bd931b6d36dbaf9fd87c1289b (tree)
• 日時: 2015-10-22 17:09:28
• 作者: Michiro Hibari <l05102@shib...>
• コミッター: Michiro Hibari

ログメッセージ

CRMファイルのサンプルをPM1.1系に対応

変更サマリ

• modified: doc/heartbeat-ra/sample.crm

差分

--- a/doc/heartbeat-ra/sample.crm
+++ b/doc/heartbeat-ra/sample.crm
@@ -1,9 +1,7 @@
 ### Cluster Option ###
 property no-quorum-policy="ignore" \
 	stonith-enabled="false" \
-	startup-fencing="false" \
-	stonith-timeout="750s" \
-	crmd-transition-delay=2s
+	startup-fencing="false"
 
 ### Resource Defaults ###
 rsc_defaults resource-stickiness="INFINITY" \
@@ -26,13 +24,16 @@ group grpUltraMonkey \
 	prmL7directord
 #group grpStonith1 \
 #	prmStonith1-1 \
-#	prmStonith1-2 \
-#	prmStonith1-3
+#	prmStonith1-2
 
 #group grpStonith2 \
 #	prmStonith2-1 \
-#	prmStonith2-2 \
-#	prmStonith2-3
+#	prmStonith2-2
+
+### Fencing Topology ###
+#fencing_topology \
+#        MODIFY_PRYMARY_HOST: prmStonith1-1 prmStonith1-2 \
+#        MODIFY_SECONDARY_HOST: prmStonith2-1 prmStonith2-2
 
 ### Primitive Configuration ###
 primitive prmVIPcheck ocf:heartbeat:VIPcheck \
@@ -61,11 +62,14 @@ primitive prmL7vsd ocf:heartbeat:L7vsd \
 	op monitor interval="10s" timeout="60s" on-fail="restart" \
 	op stop interval="0s" timeout="60s" on-fail="block"
 
-primitive prmPingd ocf:pacemaker:pingd \
+primitive prmPing ocf:pacemaker:ping \
 	params \
 		name="default_ping_set" \
 		host_list="MODIFY_PING_TARGET_IP" \
 		multiplier="100" \
+		attempts="2" \
+		timeout="2" \
+		debug="true" \
 	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="ignore"
@@ -81,58 +85,47 @@ primitive prmDiskd ocf:pacemaker:diskd \
 
 #primitive prmStonith1-1 stonith:external/stonith-helper \
 #	params \
-#		priority="1" \
+#		pcmk_reboot_retries="1" \
 #		stonith-timeout="40s" \
 #		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" \
-#	op stop interval="0s" timeout="60s"
+#		standby_check_command="/usr/sbin/crm_resource -r prmL7directord -W | grep -q `hostname`" \
+#		run_online_check="yes" \
+#	op start interval="0s" timeout="60s" on-fail="restart" \
+#	op stop interval="0s" timeout="60s" on-fail="ignore"
 
 #primitive prmStonith1-2 stonith:external/ipmi \
 #	params \
+#	       pcmk_reboot_timeout="60s" \
 #	       passwd="MODIFY_IPMI_PASSWORD" \
 #	       ipaddr="MODIFY_IPMI_IP" \
-#	       priority="2" \
 #	       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" \
-#	op stop interval="0s" timeout="60s"
-
-#primitive prmStonith1-3 stonith:meatware \
-#	params \
-#		priority="3" \
-#		stonith-timeout="600s" \
-#		hostlist="MODIFY_PRYMARY_HOST" \
-#	op start interval="0s" timeout="60s" \
-#	op monitor interval="3600s" timeout="60s" \
-#	op stop interval="0s" timeout="60s"
+#	op start interval="0s" timeout="60s" on-fail="restart" \
+#	op monitor interval="3600s" timeout="60s" on-fail="restart" \
+#	op stop interval="0s" timeout="60s" on-fail="ignore"
 
 #primitive prmStonith2-1 stonith:external/stonith-helper \
 #	params \
-#		priority="1" \
+#		pcmk_reboot_retries="1" \
 #		stonith-timeout="40s" \
 #		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" \
-#	op stop interval="0s" timeout="60s"
+#		standby_check_command="/usr/sbin/crm_resource -r prmL7directord -W | grep -q `hostname`" \
+#		run_online_check="yes" \
+#	op start interval="0s" timeout="60s" on-fail="restart" \
+#	op stop interval="0s" timeout="60s" on-fail="ignore"
 
 #primitive prmStonith2-2 stonith:external/ipmi \
 #	params \
+#	       pcmk_reboot_timeout="60s" \
 #	       passwd="MODIFY_IPMI_PASSWORD" \
 #	       ipaddr="MODIFY_IPMI_IP" \
-#	       priority="2" \
 #	       userid="MODIFY_IPMI_USER" \
 #	       hostname="MODIFY_SECONDARY_HOST" \
 #	       interface="MODIFY_IPMI_INTERFACE" \
-#	       stonith-timeout="60s" \
-#	op start interval="0s" timeout="60s" \
+#	op start interval="0s" timeout="60s" onfail\
 #	op monitor interval="3600s" timeout="60s" \
 #	op stop interval="0s" timeout="60s"
 
@@ -141,9 +134,9 @@ primitive prmDiskd ocf:pacemaker:diskd \
 #		priority="3" \
 #		stonith-timeout="600s" \
 #		hostlist="MODIFY_SECONDARY_HOST" \
-#	op start interval="0s" timeout="60s" \
-#	op monitor interval="3600s" timeout="60s" \
-#	op stop interval="0s" timeout="60s"
+#	op start interval="0s" timeout="60s" on-fail="restart" \
+#	op monitor interval="3600s" timeout="60s" on-fail="restart" \
+#	op stop interval="0s" timeout="60s" on-fail="ignore"
 
 ### Resource Location ###
 location rsc_location-grpUltraMonkey-1 grpUltraMonkey \