Feature: Add reload feature for trace_ra to prevent resource restarts

Author: Reshma676

heartbeat/IPaddr2

@@ -471,13 +471,25 @@ Consider the resource failed if the interface has status DOWN or LOWERLAYERDOWN.
 <shortdesc lang="en">Consider the resource failed if the interface has status DOWN or LOWERLAYERDOWN</shortdesc>
 <content type="string" default="${OCF_RESKEY_check_link_status_default}"/>
 </parameter>
+
+<parameter name="trace_ra">
+<longdesc lang="en">
+Set to 1 to turn on resource agent tracing (expect large output)
+The trace output will be saved to trace_file, if set, or by default to
+$HA_VARLIB/trace_ra/&lt;type&gt;/&lt;id&gt;.&lt;action&gt;.&lt;timestamp&gt;
+e.g. $HA_VARLIB/trace_ra/oracle/db.start.2012-11-27.08:37:08
+</longdesc>
+<shortdesc lang="en">Set to 1 to turn on resource agent tracing (expect large output)</shortdesc>
+<content type="integer"/>
+</parameter>
 </parameters>
 
 <actions>
 <action name="start"   timeout="20s" />
 <action name="stop"    timeout="20s" />
 <action name="status" depth="0"  timeout="20s" interval="10s" />
 <action name="monitor" depth="0"  timeout="20s" interval="10s" />
+<action name="reload"  timeout="20s" />
 <action name="meta-data"  timeout="5s" />
 <action name="validate-all"  timeout="20s" />
 </actions>
@@ -1269,6 +1281,11 @@ ip_monitor() {
 	esac
 }
 
+ip_reload() {
+	ocf_trace_reload
+	return $OCF_SUCCESS
+}
+
 # make sure that we have something to send ARPs with
 set_send_arp_program() {
     ARP_SENDER=send_arp
@@ -1420,6 +1437,8 @@ status)		ip_status=`ip_served`
 		;;
 monitor)	ip_monitor
 		;;
+reload)		ip_reload
+		;;
 validate-all)	;;
 *)		ip_usage
 		exit $OCF_ERR_UNIMPLEMENTED

heartbeat/anything

@@ -193,6 +193,11 @@ anything_monitor() {
 	fi
 }
 
+anything_reload() {
+	ocf_trace_reload
+	return $OCF_SUCCESS
+}
+
 # FIXME: Attributes special meaning to the resource id
 process="$OCF_RESOURCE_INSTANCE"
 binfile="$OCF_RESKEY_binfile"
@@ -308,11 +313,23 @@ before sending kill -SIGKILL. Defaults to 2/3 of the stop operation timeout.
 <shortdesc lang="en">Seconds to wait after having sent SIGTERM before sending SIGKILL in stop operation</shortdesc>
 <content type="string" default="${OCF_RESKEY_stop_timeout_default}"/>
 </parameter>
+
+<parameter name="trace_ra">
+<longdesc lang="en">
+Set to 1 to turn on resource agent tracing (expect large output)
+The trace output will be saved to trace_file, if set, or by default to
+$HA_VARLIB/trace_ra/&lt;type&gt;/&lt;id&gt;.&lt;action&gt;.&lt;timestamp&gt;
+e.g. $HA_VARLIB/trace_ra/oracle/db.start.2012-11-27.08:37:08
+</longdesc>
+<shortdesc lang="en">Set to 1 to turn on resource agent tracing (expect large output)</shortdesc>
+<content type="integer"/>
+</parameter>
 </parameters>
 <actions>
 <action name="start"   timeout="20s" />
 <action name="stop"    timeout="20s" />
 <action name="monitor" depth="0"  timeout="20s" interval="10s" />
+<action name="reload"  timeout="20s" />
 <action name="meta-data"  timeout="5s" />
 <action name="validate-all"  timeout="5s" />
 </actions>
@@ -334,6 +351,9 @@ case "$1" in
 	monitor)
 		anything_monitor
 	;;
+	reload)
+		anything_reload
+	;;
 	validate-all)
 		anything_validate
 	;;

heartbeat/ocf-shellfuncs.in

@@ -1137,6 +1137,14 @@ ocf_stop_trace() {
 	set +x
 }
 
+ocf_trace_reload() {
+	if ocf_is_true "$OCF_RESKEY_trace_ra"; then
+		ocf_start_trace
+	else
+		ocf_stop_trace
+	fi
+}
+
 # Helper functions to map from nodename/bundle-name and physical hostname
 # list_index_for_word "node0 node1 node2 node3 node4 node5" node4 --> 5
 # list_word_at_index "NA host1 host2 host3 host4 host5" 3      --> host2