Task #7360: ObservationControl will wait ObservationControl.finalStateDelay...

Task #7360: ObservationControl will wait ObservationControl.finalStateDelay seconds before reporting the final state to the MACScheduler.

MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc

@@ -107,10 +107,11 @@ ObservationControl::ObservationControl(const string&	cntlrName) :
 	itsProcessType   = globalParameterSet()->getString("Observation.processType", "Observation");
 
 	// Values from my conf file
-	itsLateLimit     = globalParameterSet()->getTime  ("ObservationControl.lateLimit", 15);
-	itsFailedLimit   = globalParameterSet()->getTime  ("ObservationControl.failedLimit", 30);
-	itsHeartBeatItv	 = globalParameterSet()->getTime  ("ObservationControl.heartbeatInterval", 10);
-	string reportType= globalParameterSet()->getString("ObservationControl.reportType", "Full");
+	itsLateLimit       = globalParameterSet()->getTime  ("ObservationControl.lateLimit", 15);
+	itsFailedLimit     = globalParameterSet()->getTime  ("ObservationControl.failedLimit", 30);
+	itsHeartBeatItv	   = globalParameterSet()->getTime  ("ObservationControl.heartbeatInterval", 10);
+	itsFinalStateDelay = globalParameterSet()->getTime  ("ObservationControl.finalStateDelay", 10);
+	string reportType  = globalParameterSet()->getString("ObservationControl.reportType", "Full");
 	if 		(reportType == "Full")		itsFullReport = true;
 	else if (reportType == "Changes")	itsChangeReport = true;
 
@@ -655,6 +656,8 @@ GCFEvent::TResult ObservationControl::finishing_state(GCFEvent& 		event,
 		setState(CTState::QUITED);
 
 		// inform MACScheduler we are going down
+		LOG_INFO_STR("Waiting " << itsFinalStateDelay << " seconds before reporting final state...");
+		sleep (itsFinalStateDelay);
 		CONTROLQuitedEvent	msg;
 		msg.cntlrName = getName();
 		msg.result 	  = itsQuitReason;

MAC/APL/MainCU/src/ObservationControl/ObservationControl.conf.in

@@ -28,3 +28,7 @@ ObservationControl.reportType = Full
 #
 ObservationControl.emergencyTimeout = 1h
 
+#
+# Delay before reporting FINAL state to MACScheduler
+#
+ObservationControl.finalStateDelay = 10s

MAC/APL/MainCU/src/ObservationControl/ObservationControl.h

@@ -171,6 +171,7 @@ private:
 	uint32					itsTreeID;
 	uint32					itsHeartBeatItv;
 	uint32					itsForcedQuitDelay;
+	uint32					itsFinalStateDelay;
 	uint32					itsClaimPeriod;
 	uint32					itsPreparePeriod;
 	int32					itsLateLimit;		// after how many seconds a requested state should have been reached.