While doing the wrapup of a one-step upgrade with reboot the other
controller takes extra time to come back up. Now when we have a CLI
command in the campaign doing a operation on that missing controller the
campaign will fail. The reason is that there is no timer to wait for
node up. This patch uses a prexisting function with a timer that waits
until a node comes up for 10 minutes. The time is taken from SMF
configuration 'smfRebootTimeout'.
---
src/smf/smfd/SmfUpgradeAction.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/smf/smfd/SmfUpgradeAction.cc b/src/smf/smfd/SmfUpgradeAction.cc
index f8ae58d..94c3dfd 100644
--- a/src/smf/smfd/SmfUpgradeAction.cc
+++ b/src/smf/smfd/SmfUpgradeAction.cc
@@ -151,7 +151,7 @@ SaAisErrorT SmfCliCommandAction::execute(SaImmOiHandleT
i_oiHandle,
for (it = m_plmExecEnvList.begin(); it != m_plmExecEnvList.end(); ++it) {
const std::string& n = it->getPrefered();
SmfndNodeDest nodeDest;
- if (!getNodeDestination(n, &nodeDest, NULL, -1)) {
+ if (!waitForNodeDestination(n, &nodeDest)) {
LOG_ER("SmfCliCommandAction no node destination found for node %s",
n.c_str());
result = SA_AIS_ERR_NOT_EXIST;
@@ -199,7 +199,7 @@ SaAisErrorT SmfCliCommandAction::rollback(const
std::string& i_rollbackDn) {
for (it = m_plmExecEnvList.rbegin(); it != m_plmExecEnvList.rend(); ++it) {
const std::string& n = it->getPrefered();
SmfndNodeDest nodeDest;
- if (!getNodeDestination(n, &nodeDest, NULL, -1)) {
+ if (!waitForNodeDestination(n, &nodeDest)) {
LOG_ER("SmfCliCommandAction no node destination found for node %s",
n.c_str());
result = SA_AIS_ERR_NOT_EXIST;
--
1.9.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
