[devel] [PATCH 1/1] amfd: do not assert unnecessarily [#2458]

[Gary Lee]

IMM APIs can fail if immnd finishes shutting down before amfd.
amfd should not unnecessarily assert and cause core dumps
to be created.
---
 src/amf/amfd/app.cc  | 7 +++++--
 src/amf/amfd/comp.cc | 7 +++++--
 src/amf/amfd/sg.cc   | 7 +++++--
 src/amf/amfd/si.cc   | 7 +++++--
 src/amf/amfd/su.cc   | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/amf/amfd/app.cc b/src/amf/amfd/app.cc
index 62ad34acb..424d82847 100644
--- a/src/amf/amfd/app.cc
+++ b/src/amf/amfd/app.cc
@@ -470,8 +470,11 @@ SaAisErrorT avd_app_config_get(void) {
     if (avd_si_config_get(app) != SA_AIS_OK) goto done2;
   }
 
-  osafassert(rc == SA_AIS_ERR_NOT_EXIST);
-  error = SA_AIS_OK;
+  if (rc == SA_AIS_ERR_NOT_EXIST) {
+    error = SA_AIS_OK;
+  } else {
+    LOG_ER("avd_app_config_get FAILED %u", rc);
+  }
 done2:
   (void)immutil_saImmOmSearchFinalize(searchHandle);
 done1:
diff --git a/src/amf/amfd/comp.cc b/src/amf/amfd/comp.cc
index 3e0dc5de1..e3f0f9051 100644
--- a/src/amf/amfd/comp.cc
+++ b/src/amf/amfd/comp.cc
@@ -811,8 +811,11 @@ SaAisErrorT avd_comp_config_get(const std::string 
&su_name, AVD_SU *su) {
     goto done2;
   }
 
-  osafassert(rc == SA_AIS_ERR_NOT_EXIST);
-  error = SA_AIS_OK;
+  if (rc == SA_AIS_ERR_NOT_EXIST) {
+    error = SA_AIS_OK;
+  } else {
+    LOG_ER("avd_comp_config_get FAILED %u", rc);
+  }
 
 done2:
   (void)immutil_saImmOmSearchFinalize(searchHandle);
diff --git a/src/amf/amfd/sg.cc b/src/amf/amfd/sg.cc
index 9b04a423c..79e8f5fd7 100644
--- a/src/amf/amfd/sg.cc
+++ b/src/amf/amfd/sg.cc
@@ -499,8 +499,11 @@ SaAisErrorT avd_sg_config_get(const std::string &app_dn, 
AVD_APP *app) {
     }
   }
 
-  osafassert(rc == SA_AIS_ERR_NOT_EXIST);
-  error = SA_AIS_OK;
+  if (rc == SA_AIS_ERR_NOT_EXIST) {
+    error = SA_AIS_OK;
+  } else {
+    LOG_ER("avd_sg_config_get FAILED %u", rc);
+  }
 
 done2:
   (void)immutil_saImmOmSearchFinalize(searchHandle);
diff --git a/src/amf/amfd/si.cc b/src/amf/amfd/si.cc
index 298188a84..51dd9a662 100644
--- a/src/amf/amfd/si.cc
+++ b/src/amf/amfd/si.cc
@@ -705,8 +705,11 @@ SaAisErrorT avd_si_config_get(AVD_APP *app) {
     if (avd_csi_config_get(si_str, si) != SA_AIS_OK) goto done2;
   }
 
-  osafassert(rc == SA_AIS_ERR_NOT_EXIST);
-  error = SA_AIS_OK;
+  if (rc == SA_AIS_ERR_NOT_EXIST) {
+    error = SA_AIS_OK;
+  } else {
+    LOG_ER("avd_si_config_get FAILED %u", rc);
+  }
 
 done2:
   (void)immutil_saImmOmSearchFinalize(searchHandle);
diff --git a/src/amf/amfd/su.cc b/src/amf/amfd/su.cc
index fac1188b5..62c372822 100644
--- a/src/amf/amfd/su.cc
+++ b/src/amf/amfd/su.cc
@@ -750,8 +750,11 @@ SaAisErrorT avd_su_config_get(const std::string &sg_name, 
AVD_SG *sg) {
     }
   }
 
-  osafassert(rc == SA_AIS_ERR_NOT_EXIST);
-  error = SA_AIS_OK;
+  if (rc == SA_AIS_ERR_NOT_EXIST) {
+    error = SA_AIS_OK;
+  } else {
+    LOG_ER("avd_su_config_get FAILED %u", rc);
+  }
 
 done2:
   (void)immutil_saImmOmSearchFinalize(searchHandle);
-- 
2.11.0


------------------------------------------------------------------------------
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