osaf/services/saf/amf/amfd/include/timer.h |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Since the AVD_TMR_CL_INIT can be started/restarted to wait for all SU presence 
state
synchronization, so m_AVD_CLINIT_TMR_START could not always be called as the 
first start. As
a result, due to @is_active is set to false before start timer, therefore the 
timer can be
restarted without stop in advance. It appears a warning as below

Sep 22 22:08:22.640710 osafamfd [477:timer.cc:0066] TEST >> avd_start_tmr: 1
Sep 22 22:08:22.640717 osafamfd [477:sysf_tmr.c:0690] TR IN LEAP_DBG_SINK
Sep 22 22:08:22.640758 osafamfd [477:timer.cc:0096] << avd_start_tmr

Patch removes setting @is_active to false in m_AVD_CLINIT_TMR_START

diff --git a/osaf/services/saf/amf/amfd/include/timer.h 
b/osaf/services/saf/amf/amfd/include/timer.h
--- a/osaf/services/saf/amf/amfd/include/timer.h
+++ b/osaf/services/saf/amf/amfd/include/timer.h
@@ -65,7 +65,6 @@ typedef struct avd_tmr_tag {
 #define m_AVD_CLINIT_TMR_START(cb) \
 {\
        saflog(LOG_NOTICE, amfSvcUsrName, "Starting cluster startup timer"); \
-       cb->amf_init_tmr.is_active = false; \
        cb->amf_init_tmr.type = AVD_TMR_CL_INIT; \
        avd_start_tmr(cb,&(cb->amf_init_tmr), 
avd_cluster->saAmfClusterStartupTimeout); \
 }

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to