---
.../imm_modify_config/add_operation_to_ccb.cc | 23 +++++--------------
src/smf/smfd/imm_modify_config/immccb.cc | 21 ++++++++---------
2 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
b/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
index e9dea7930..9273b7739 100644
--- a/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
+++ b/src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc
@@ -103,6 +103,8 @@ int AddCreateToCcb(const SaImmCcbHandleT& ccb_handle,
if (creator.AddObjectCreateToCcb() == false) {
// Add create Fail
SaAisErrorT ais_rc = creator.ais_error();
+ api_name_ = "saImmOmCcbObjectCreate_2";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BAD_HANDLE) {
recovery_info = kRestartOm;
TRACE("%s: AddObjectCreateToCcb(), %s, kRestartOm",
@@ -116,8 +118,6 @@ int AddCreateToCcb(const SaImmCcbHandleT& ccb_handle,
LOG_NO("%s: AddObjectCreateToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectCreate_2";
- ais_error_ = ais_rc;
}
} else if (ais_rc == SA_AIS_ERR_EXIST) {
if (create_descriptor.ignore_ais_err_exist == true) {
@@ -125,16 +125,11 @@ int AddCreateToCcb(const SaImmCcbHandleT& ccb_handle,
} else {
recovery_info = kFail;
}
- // Note: This information is always needed also if we do not fail
- api_name_ = "saImmOmCcbObjectCreate_2";
- ais_error_ = ais_rc;
} else {
// Unrecoverable Fail
LOG_NO("%s: ObjectCreateCcbAdd(), %s, kFail",
__FUNCTION__, saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectCreate_2";
- ais_error_ = ais_rc;
}
} else {
// Add create success
@@ -161,6 +156,8 @@ int AddDeleteToCcb(const SaImmCcbHandleT& ccb_handle,
if (deletor.AddObjectDeleteToCcb(delete_descriptor.object_name) == false) {
// Add delete Fail
SaAisErrorT ais_rc = deletor.ais_error();
+ api_name_ = "saImmOmCcbObjectDelete";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BUSY) {
base::Sleep(base::MillisToTimespec(kBusyWait));
continue;
@@ -180,8 +177,6 @@ int AddDeleteToCcb(const SaImmCcbHandleT& ccb_handle,
LOG_NO("%s: AddObjectDeleteToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectDelete";
- ais_error_ = ais_rc;
break;
}
} else if (ais_rc == SA_AIS_ERR_NOT_EXIST) {
@@ -191,16 +186,12 @@ int AddDeleteToCcb(const SaImmCcbHandleT& ccb_handle,
LOG_NO("%s: AddObjectDeleteToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectDelete";
- ais_error_ = ais_rc;
}
} else {
// Other unrecoverable Fail
LOG_NO("%s: AddObjectDeleteToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectDelete";
- ais_error_ = ais_rc;
break;
}
}
@@ -261,6 +252,8 @@ int AddModifyToCcb(const SaImmCcbHandleT& ccb_handle,
while (busy_timer.is_timeout() != true) {
if (modifier.AddObjectModifyToCcb() == false) {
ais_rc = modifier.ais_error();
+ api_name_ = "saImmOmCcbObjectModify_2";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BUSY) {
base::Sleep(base::MillisToTimespec(kBusyWait));
continue;
@@ -280,8 +273,6 @@ int AddModifyToCcb(const SaImmCcbHandleT& ccb_handle,
LOG_NO("%s: AddObjectModifyToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectModify_2";
- ais_error_ = ais_rc;
break;
}
} else {
@@ -289,8 +280,6 @@ int AddModifyToCcb(const SaImmCcbHandleT& ccb_handle,
LOG_NO("%s: AddObjectModifyToCcb() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbObjectModify_2";
- ais_error_ = ais_rc;
break;
}
}
diff --git a/src/smf/smfd/imm_modify_config/immccb.cc
b/src/smf/smfd/imm_modify_config/immccb.cc
index c8cdac2d3..63392759e 100644
--- a/src/smf/smfd/imm_modify_config/immccb.cc
+++ b/src/smf/smfd/imm_modify_config/immccb.cc
@@ -221,13 +221,14 @@ int ModelModification::CreateObjectManager() {
bool return_state = imm_om_handle_->InitializeHandle();
if (return_state == false) {
SaAisErrorT ais_error = imm_om_handle_->ais_error();
+ api_name_ = "saImmOmInitialize";
+ ais_error_ = ais_error;
if (ais_error == SA_AIS_ERR_TRY_AGAIN) {
recovery_info = kRestartOm;
} else {
// No recovery is possible
LOG_NO("%s: OM-handle, RestoreHandle(), Fail", __FUNCTION__);
recovery_info = kFail;
- api_name_ = "saImmOmInitialize";
}
} else {
recovery_info = kContinue;
@@ -259,6 +260,8 @@ int ModelModification::CreateAdminOwner() {
bool rc = imm_ao_handle_->InitializeHandle(om_handle);
if (rc == false) {
SaAisErrorT ais_rc = imm_ao_handle_->ais_error();
+ api_name_ = "saImmOmAdminOwnerInitialize";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BAD_HANDLE) {
TRACE("%s: Admin Owner handle, InitializeHandle() Restart",
__FUNCTION__);
@@ -267,8 +270,6 @@ int ModelModification::CreateAdminOwner() {
LOG_NO("%s: Admin Owner handle, InitializeHandle() Fail",
__FUNCTION__);
recovery_info = kFail;
- api_name_ = "saImmOmAdminOwnerInitialize";
- ais_error_ = ais_rc;
}
} else {
SaImmAdminOwnerHandleT ao_handle = imm_ao_handle_->GetHandle();
@@ -300,14 +301,14 @@ int ModelModification::CreateCcb() {
bool rc = imm_ccb_handle_->InitializeHandle(ao_handle);
if (rc == false) {
SaAisErrorT ais_rc = imm_ccb_handle_->ais_error();
+ api_name_ = "saImmOmCcbInitialize";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BAD_HANDLE) {
TRACE("%s: CCB handle, InitializeHandle() Restart", __FUNCTION__);
recovery_info = kRestartOm;
} else {
LOG_NO("%s: CCB handle, InitializeHandle() Fail", __FUNCTION__);
recovery_info = kFail;
- api_name_ = "saImmOmCcbInitialize";
- ais_error_ = ais_rc;
}
} else {
recovery_info = kContinue;
@@ -388,6 +389,8 @@ int ModelModification::AdminOwnerSet(const
std::vector<std::string>& objects,
while (exist_timer.is_timeout() == false) {
if (imm_ao_owner_set_->SetAdminOwner(scope) == false) {
ais_rc = imm_ao_owner_set_->ais_error();
+ api_name_ = "saImmOmAdminOwnerSet";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_EXIST) {
// Another owner of object(s) exist. Wait for other owner release
base::Sleep(base::MillisToTimespec(kExistWait));
@@ -401,8 +404,6 @@ int ModelModification::AdminOwnerSet(const
std::vector<std::string>& objects,
LOG_NO("%s: SetAdminOwner() Fail, %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmAdminOwnerSet";
- ais_error_ = ais_rc;
break;
}
}
@@ -682,6 +683,8 @@ int ModelModification::ApplyModifications() {
if (imm_ccb_handle_->ApplyCcb() == false) {
SaAisErrorT ais_rc = imm_ccb_handle_->ais_error();
+ api_name_ = "saImmOmCcbApply";
+ ais_error_ = ais_rc;
if (ais_rc == SA_AIS_ERR_BAD_HANDLE) {
TRACE("%s: ApplyCcb() Restart %s", __FUNCTION__,
saf_error(ais_rc));
@@ -695,14 +698,10 @@ int ModelModification::ApplyModifications() {
LOG_NO("%s: ApplyCcb() Fail %s", __FUNCTION__,
saf_error(ais_rc));
recovery_info = kFail;
- api_name_ = "saImmOmCcbApply";
- ais_error_ = ais_rc;
}
} else {
LOG_ER("%s: ApplyCcb() Fail", __FUNCTION__);
recovery_info = kFail;
- api_name_ = "saImmOmCcbApply";
- ais_error_ = ais_rc;
}
} else {
TRACE("%s: CCB is applied", __FUNCTION__);
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
