osaf/services/saf/amf/amfd/ckpt_dec.cc | 28 +--------------------
osaf/services/saf/amf/amfd/ckpt_updt.cc | 1 -
osaf/services/saf/amf/amfd/include/su.h | 38 +++++------------------------
osaf/services/saf/amf/amfd/su.cc | 41 ++++++++++++++++----------------
osaf/services/saf/amf/amfd/util.cc | 1 -
5 files changed, 29 insertions(+), 80 deletions(-)
su_act_state is not used thus can be made a dummy (not removed because of EDU
usage). The corresponding enum AVD_SU_STATE removed. Checkpointing of
su_act_state kept for backwards compatibility but reduced to a minimum.
The use of "this->" is removed from some setters.
Some non existing function signatures removed from the header file.
diff --git a/osaf/services/saf/amf/amfd/ckpt_dec.cc
b/osaf/services/saf/amf/amfd/ckpt_dec.cc
--- a/osaf/services/saf/amf/amfd/ckpt_dec.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_dec.cc
@@ -1846,34 +1846,10 @@ static uint32_t dec_su_switch(AVD_CL_CB
\**************************************************************************/
static uint32_t dec_su_act_state(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC *dec)
{
- uint32_t status = NCSCC_RC_SUCCESS;
- AVD_SU *su_ptr;
- AVD_SU dec_su;
- EDU_ERR ederror = static_cast<EDU_ERR>(0);
- AVD_SU *su_struct;
-
TRACE_ENTER();
-
- su_ptr = &dec_su;
-
- /*
- * Action in this case is just to update.
- */
- status = ncs_edu_exec(&cb->edu_hdl, avsv_edp_ckpt_msg_su,
- &dec->i_uba, EDP_OP_TYPE_DEC, (AVD_SU **)&su_ptr, &ederror, 2, 1,
13);
-
- osafassert(status == NCSCC_RC_SUCCESS);
-
- if (NULL == (su_struct = su_db->find(&su_ptr->name)))
- osafassert(0);
-
- /* Update the fields received in this checkpoint message */
- su_struct->su_act_state = su_ptr->su_act_state;
-
cb->async_updt_cnt.su_updt++;
-
- TRACE_LEAVE2("status '%u'", status);
- return status;
+ TRACE_LEAVE();
+ return NCSCC_RC_SUCCESS;
}
/****************************************************************************\
diff --git a/osaf/services/saf/amf/amfd/ckpt_updt.cc
b/osaf/services/saf/amf/amfd/ckpt_updt.cc
--- a/osaf/services/saf/amf/amfd/ckpt_updt.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_updt.cc
@@ -200,7 +200,6 @@ uint32_t avd_ckpt_su(AVD_CL_CB *cb, AVD_
memcpy(&su->saAmfSUHostedByNode, &ckpt_su->saAmfSUHostedByNode,
sizeof(SaNameT));
su->term_state = ckpt_su->term_state;
su->su_switch = ckpt_su->su_switch;
- su->su_act_state = ckpt_su->su_act_state;
su->saAmfSURestartCount = ckpt_su->saAmfSURestartCount;
done:
diff --git a/osaf/services/saf/amf/amfd/include/su.h
b/osaf/services/saf/amf/amfd/include/su.h
--- a/osaf/services/saf/amf/amfd/include/su.h
+++ b/osaf/services/saf/amf/amfd/include/su.h
@@ -16,21 +16,12 @@
*/
/*****************************************************************************
-..............................................................................
-..............................................................................
-
- DESCRIPTION:
-
- This module is the include file for handling Availability Directors
- service unit structure.
+ DESCRIPTION: Service Unit class definition
******************************************************************************
*/
-/*
- * Module Inclusion Control...
- */
#ifndef AVD_SU_H
#define AVD_SU_H
@@ -44,16 +35,8 @@
#include <comp.h>
#include "include/db_template.h"
-/* The semantics the SU is undergoing. */
-typedef enum {
- AVD_SU_NO_STATE = 0,
- AVD_SU_OPER,
- AVD_SU_NODE_OPER
-} AVD_SU_STATE;
-
-/* Avialability directors Service Unit structure(AVD_SU):
- * This data structure lives in the AvD and reflects data points
- * associated with the Service Unit (SU) on the AvD.
+/**
+ * AMF director Service Unit representation.
*/
class AVD_SU {
public:
@@ -62,7 +45,8 @@ class AVD_SU {
uint32_t saAmfSURank;
SaNameT saAmfSUHostNodeOrNodeGroup;
bool saAmfSUFailover;
- bool saAmfSUFailover_configured; /* True when user configures
saAmfSUFailover else false */
+ /* true when user has configured saAmfSUFailover */
+ bool saAmfSUFailover_configured;
SaNameT saAmfSUMaintenanceCampaign;
/* runtime attributes */
@@ -71,11 +55,10 @@ class AVD_SU {
SaAmfAdminStateT saAmfSUAdminState;
SaAmfReadinessStateT saAmfSuReadinessState;
SaAmfPresenceStateT saAmfSUPresenceState;
- SaNameT **saAmfSUAssignedSIs;
SaNameT saAmfSUHostedByNode;
SaUint32T saAmfSUNumCurrActiveSIs;
SaUint32T saAmfSUNumCurrStandbySIs;
- SaUint32T saAmfSURestartCount; // TODO use this!
+ SaUint32T saAmfSURestartCount;
AVD_ADMIN_OPER_CBK pend_cbk; /* Stores zero invocation value of imm
adm cbk
* when no admin operation is going on.
@@ -94,10 +77,7 @@ class AVD_SU {
bool su_is_external; /* indicates if this SU is external */
- AVD_SU_STATE su_act_state; /* The current action flow of
- * the SU w.r.t to the node.
- * Checkpointing - Updated
independently.
- */
+ int su_act_state; // not used, kept for EDU, remove later
struct avd_sg_tag *sg_of_su; /* the service group of this SU */
struct avd_avnd_tag *su_on_node; /* the node on which this SU
resides */
@@ -169,10 +149,6 @@ extern void avd_su_delete(AVD_SU *su);
extern void avd_su_remove_comp(struct avd_comp_tag *comp);
extern void avd_su_add_comp(struct avd_comp_tag *comp);
-void avd_su_add_sg_list(AVD_CL_CB *cb, AVD_SU *su);
-void avd_su_del_sg_list(AVD_CL_CB *cb, AVD_SU *su);
-void avd_su_del_avnd_list(AVD_CL_CB *cb, AVD_SU *su);
-
/**
* Get SUs from IMM and create internal objects
*
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -50,7 +50,6 @@ AVD_SU *avd_su_new(const SaNameT *dn)
su->saAmfSUOperState = static_cast<SaAmfOperationalStateT>(0);
su->saAmfSUPresenceState = SA_AMF_PRESENCE_UNINSTANTIATED;
su->saAmfSuReadinessState = SA_AMF_READINESS_OUT_OF_SERVICE;
- su->su_act_state = AVD_SU_NO_STATE;
su->su_is_external = false;
return su;
@@ -776,31 +775,31 @@ void AVD_SU::set_oper_state(SaAmfOperati
* @param readiness_state
*/
void AVD_SU::set_readiness_state(SaAmfReadinessStateT readiness_state) {
- if (this->saAmfSuReadinessState == readiness_state)
+ if (saAmfSuReadinessState == readiness_state)
return;
AVD_COMP *comp = NULL;
osafassert(readiness_state <= SA_AMF_READINESS_STOPPING);
- TRACE_ENTER2("'%s' %s", this->name.value,
+ TRACE_ENTER2("'%s' %s", name.value,
avd_readiness_state_name[readiness_state]);
saflog(LOG_NOTICE, amfSvcUsrName, "%s ReadinessState %s => %s",
- this->name.value,
- avd_readiness_state_name[this->saAmfSuReadinessState],
+ name.value,
+ avd_readiness_state_name[saAmfSuReadinessState],
avd_readiness_state_name[readiness_state]);
- this->saAmfSuReadinessState = readiness_state;
- avd_saImmOiRtObjectUpdate(&this->name, "saAmfSUReadinessState",
- SA_IMM_ATTR_SAUINT32T, &this->saAmfSuReadinessState);
+ saAmfSuReadinessState = readiness_state;
+ avd_saImmOiRtObjectUpdate(&name, "saAmfSUReadinessState",
+ SA_IMM_ATTR_SAUINT32T, &saAmfSuReadinessState);
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this,
AVSV_CKPT_SU_READINESS_STATE);
/* Since Su readiness state has changed, we need to change it for all
the
* component in this SU.*/
- comp = this->list_of_comp;
+ comp = list_of_comp;
while (comp != NULL) {
SaAmfReadinessStateT saAmfCompReadinessState;
- if ((this->saAmfSuReadinessState ==
SA_AMF_READINESS_IN_SERVICE) &&
+ if ((saAmfSuReadinessState == SA_AMF_READINESS_IN_SERVICE) &&
(comp->saAmfCompOperState ==
SA_AMF_OPERATIONAL_ENABLED)) {
saAmfCompReadinessState = SA_AMF_READINESS_IN_SERVICE;
- } else if((this->saAmfSuReadinessState ==
SA_AMF_READINESS_STOPPING) &&
+ } else if((saAmfSuReadinessState == SA_AMF_READINESS_STOPPING)
&&
(comp->saAmfCompOperState ==
SA_AMF_OPERATIONAL_ENABLED)) {
saAmfCompReadinessState = SA_AMF_READINESS_STOPPING;
} else
@@ -1655,24 +1654,24 @@ void su_nd_attribute_update(const AVD_SU
*
*/
void AVD_SU::delete_all_susis(void) {
- TRACE_ENTER2("'%s'", this->name.value);
+ TRACE_ENTER2("'%s'", name.value);
- while (this->list_of_susi != NULL) {
- avd_compcsi_delete(avd_cb, this->list_of_susi, false);
- m_AVD_SU_SI_TRG_DEL(avd_cb, this->list_of_susi);
+ while (list_of_susi != NULL) {
+ avd_compcsi_delete(avd_cb, list_of_susi, false);
+ m_AVD_SU_SI_TRG_DEL(avd_cb, list_of_susi);
}
- this->saAmfSUNumCurrStandbySIs = 0;
- this->saAmfSUNumCurrActiveSIs = 0;
+ saAmfSUNumCurrStandbySIs = 0;
+ saAmfSUNumCurrActiveSIs = 0;
m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this, AVSV_CKPT_AVD_SU_CONFIG);
TRACE_LEAVE();
}
void AVD_SU::set_all_susis_assigned_quiesced(void) {
- AVD_SU_SI_REL *susi = this->list_of_susi;
+ AVD_SU_SI_REL *susi = list_of_susi;
- TRACE_ENTER2("'%s'", this->name.value);
+ TRACE_ENTER2("'%s'", name.value);
for (; susi != NULL; susi = susi->su_next) {
if (susi->fsm != AVD_SU_SI_STATE_UNASGN) {
@@ -1690,9 +1689,9 @@ void AVD_SU::set_all_susis_assigned_quie
}
void AVD_SU::set_all_susis_assigned(void) {
- AVD_SU_SI_REL *susi = this->list_of_susi;
+ AVD_SU_SI_REL *susi = list_of_susi;
- TRACE_ENTER2("'%s'", this->name.value);
+ TRACE_ENTER2("'%s'", name.value);
for (; susi != NULL; susi = susi->su_next) {
if (susi->fsm != AVD_SU_SI_STATE_UNASGN) {
diff --git a/osaf/services/saf/amf/amfd/util.cc
b/osaf/services/saf/amf/amfd/util.cc
--- a/osaf/services/saf/amf/amfd/util.cc
+++ b/osaf/services/saf/amf/amfd/util.cc
@@ -1404,7 +1404,6 @@ void amfd_file_dump(const char *path)
fprintf(f, "\tsaAmfSURestartCount=%u\n",
su->saAmfSURestartCount);
fprintf(f, "\tterm_state=%u\n", su->term_state);
fprintf(f, "\tsu_switch=%u\n", su->su_switch);
- fprintf(f, "\tsu_act_state=%u\n", su->su_act_state);
dn = su->name;
}
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
