Ack.
-----Original Message-----
From: Minh Hon Chau <minh.c...@dektech.com.au>
Sent: Wednesday, May 12, 2021 7:58 AM
To: Thien Minh Huynh <thien.m.hu...@dektech.com.au>; Surbhi Tripathi
<surbhi.tripa...@dektech.com.au>; Thang Duc Nguyen
<thang.d.ngu...@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net; Minh Hon Chau
<minh.c...@dektech.com.au>
Subject: [PATCH 2/2] imma: Correctly use IMMA_SYNCR_TIMEOUT [#3260]
---
src/imm/agent/imma_oi_api.cc | 2 +-
src/imm/agent/imma_om_api.cc | 2 +-
src/imm/agent/imma_proc.cc | 5 +++--
src/imm/immd/immd_cb.h | 1 -
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/imm/agent/imma_oi_api.cc b/src/imm/agent/imma_oi_api.cc index
8e9a1f2b0..c79d0e315 100644
--- a/src/imm/agent/imma_oi_api.cc
+++ b/src/imm/agent/imma_oi_api.cc
@@ -3510,7 +3510,7 @@ int imma_oi_resurrect(IMMA_CB *cb, IMMA_CLIENT_NODE
*cl_node, bool *locked,
osafassert(locked && *locked);
osafassert(cl_node && cl_node->stale);
SaImmOiHandleT immOiHandle = cl_node->handle;
- SaTimeT timeout = 0;
+ SaTimeT timeout = IMMSV_WAIT_TIME;
m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE);
*locked = false;
diff --git a/src/imm/agent/imma_om_api.cc b/src/imm/agent/imma_om_api.cc index
55fdcc2d8..f34e7645c 100644
--- a/src/imm/agent/imma_om_api.cc
+++ b/src/imm/agent/imma_om_api.cc
@@ -9761,7 +9761,7 @@ int imma_om_resurrect(IMMA_CB *cb, IMMA_CLIENT_NODE
*cl_node, bool *locked) {
osafassert(locked && *locked);
osafassert(cl_node && cl_node->stale);
SaImmHandleT immHandle = cl_node->handle;
- SaTimeT timeout = 0;
+ SaTimeT timeout = IMMSV_WAIT_TIME;
SaAisErrorT err_resurrect = SA_AIS_OK;
m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE); diff --git
a/src/imm/agent/imma_proc.cc b/src/imm/agent/imma_proc.cc index
ea035827f..723550904 100644
--- a/src/imm/agent/imma_proc.cc
+++ b/src/imm/agent/imma_proc.cc
@@ -1570,6 +1570,7 @@ uint32_t imma_proc_resurrect_client(IMMA_CB *cb,
SaImmHandleT immHandle,
unsigned int sleep_delay_ms = 500;
unsigned int max_waiting_time_ms = 2 * 1000; /* 2 secs */
unsigned int msecs_waited = 0;
+ SaTimeT timeout = IMMSV_WAIT_TIME;
if (m_NCS_LOCK(&cb->cb_lock, NCS_LOCK_WRITE) != NCSCC_RC_SUCCESS) {
TRACE_3("Lock failure");
@@ -1583,7 +1584,7 @@ uint32_t imma_proc_resurrect_client(IMMA_CB *cb,
SaImmHandleT immHandle,
cl_node, cl_node ? cl_node->exposed : 0);
goto failure;
}
-
+ timeout = cl_node->syncr_timeout;
if (!cl_node->stale) {
TRACE_3(
"imma_proc_resurrect_client: Handle %llx was not stale, "
@@ -1623,7 +1624,7 @@ uint32_t imma_proc_resurrect_client(IMMA_CB *cb,
SaImmHandleT immHandle,
/* send the request to the IMMND */
if (imma_mds_msg_sync_send(cb->imma_mds_hdl, &(cb->immnd_mds_dest),
&resurrect_evt, &out_evt,
- IMMSV_WAIT_TIME) != NCSCC_RC_SUCCESS) {
+ timeout) != NCSCC_RC_SUCCESS) {
TRACE_3("Failure in MDS send");
goto exposed;
}
diff --git a/src/imm/immd/immd_cb.h b/src/imm/immd/immd_cb.h index
e9710ff71..51f52aba8 100644
--- a/src/imm/immd/immd_cb.h
+++ b/src/imm/immd/immd_cb.h
@@ -23,7 +23,6 @@
#include <saClm.h>
#define IMMD_EVT_TIME_OUT 100
-#define IMMSV_WAIT_TIME 100
#define m_IMMND_IS_ON_SCXB(m, n) ((m == n) ? 1 : 0) #define
m_IMMD_IS_LOCAL_NODE(m, n) (m == n) ? 1 : 0
--
2.20.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
