[devel] [PATCH 0 of 1] Review Request for IMMTEST: Cleanup the code and fix memory problem [#552]
Summary: IMMTEST: Cleanup the code and fix memory problem [#552] Review request for Trac Ticket(s): 552 Peer Reviewer(s): Neel Pull request to: Zoran Affected branch(es): opensaf-4.3.x Development branch: opensaf-4.3.x Impacted area Impact y/n Docsn Build systemn RPM/packaging n Configuration files n Startup scripts n SAF servicesn OpenSAF servicesn Core libraries n Samples n Tests y Other n Comments (indicate scope for each y above): - changeset 6e718b7dfad5d813286331a7498cdc3351591288 Author: Zoran Milinkovic zoran.milinko...@ericsson.com Date: Thu, 12 Sep 2013 04:40:23 -0400 IMMTEST: Cleanup the code and fix memory problem [#552] Complete diffstat: -- tests/immsv/common/immtest.c| 4 tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c | 2 +- tests/immsv/implementer/test_cleanup.c | 2 +- tests/immsv/management/test_cleanup.c | 2 +- tests/immsv/management/test_saImmOmAdminOwnerFinalize.c | 1 + tests/immsv/management/test_saImmOmInitialize.c | 1 + tests/immsv/management/test_saImmOmSearchInitialize_2.c | 2 +- tests/immsv/management/test_saImmOmThreadInterference.c | 10 +++--- 8 files changed, 17 insertions(+), 7 deletions(-) Testing Commands: - valgrind --leak-check=full --show-reachable=yes --track-origins=yes immomtest valgrind --leak-check=full --show-reachable=yes --track-origins=yes immoitest Testing, Expected Results: -- Valgrind should not report any memory leak. Conditions of Submission: - Ack from Neel. Arch Built StartedLinux distro --- mipsn n mips64 n n x86 n n x86_64 n n powerpc n n powerpc64 n n Reviewer Checklist: --- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull. ___ You have resent this content multiple times without a clear indication of what has changed between each re-send. ___ You have failed to adequately and individually address all of the comments and change requests that were proposed in the initial review. ___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual. -- How ServiceNow helps IT people transform IT departments: 1. Consolidate legacy IT systems to a single system of record for IT 2. Standardize and globalize service processes across IT 3. Implement zero-touch automation to replace manual, redundant tasks http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
[devel] [PATCH 1 of 1] amfnd: terminate comps when failed NPI SU is in TERMINATING state [#338]
osaf/services/saf/avsv/avnd/avnd_clc.c | 3 ++-
osaf/services/saf/avsv/avnd/avnd_susm.c | 28
2 files changed, 30 insertions(+), 1 deletions(-)
In case of NPI SU, failed component is cleaned up when AMFD sends quiesced HA
state to AMFND.
In this issue when SU is still instantiating, one instantiated component failed
with suFailover recovery.
When AMFD sends quiesced HA state, AMFND moves SU to terminating state without
cleaning up failed component.
When another component gets fully instantiated, SU FSM should trigger
termination of healthy components and
cleanup of failed components. This patch ensures that if SU moves from
Instantiating to Terminating state due to suFailover then after
instantiation of all the components SU FSM will terminate or cleanup all
components and will, thus, finish quiesced assignments.
diff --git a/osaf/services/saf/avsv/avnd/avnd_clc.c
b/osaf/services/saf/avsv/avnd/avnd_clc.c
--- a/osaf/services/saf/avsv/avnd/avnd_clc.c
+++ b/osaf/services/saf/avsv/avnd/avnd_clc.c
@@ -2028,7 +2028,8 @@ uint32_t avnd_comp_clc_terming_cleansucc
}
/* TODO(hafe) needs to be changed when SU failover is implemented */
- if (m_AVND_COMP_IS_FAILED(comp) m_AVND_SU_IS_FAILED(comp-su)) {
+ if (m_AVND_COMP_IS_FAILED(comp) m_AVND_SU_IS_FAILED(comp-su)
+ m_AVND_SU_IS_PREINSTANTIABLE(comp-su)) {
/* request director to orchestrate component failover */
rc = avnd_di_oper_send(cb, comp-su, SA_AMF_COMPONENT_FAILOVER);
}
diff --git a/osaf/services/saf/avsv/avnd/avnd_susm.c
b/osaf/services/saf/avsv/avnd/avnd_susm.c
--- a/osaf/services/saf/avsv/avnd/avnd_susm.c
+++ b/osaf/services/saf/avsv/avnd/avnd_susm.c
@@ -2118,6 +2118,8 @@ uint32_t avnd_su_pres_inst_compterming_h
uint32_t avnd_su_pres_terming_compinst_hdler(AVND_CB *cb, AVND_SU *su,
AVND_COMP *comp)
{
bool is;
+ AVND_SU_SI_REC *si = 0;
+ AVND_COMP_CSI_REC *csi = 0;
uint32_t rc = NCSCC_RC_SUCCESS;
char *compname = comp ? (char*)comp-name.value : none;
TRACE_ENTER2(ComponentInstantiate event in the terminating state:'%s'
: '%s',
@@ -2135,6 +2137,32 @@ uint32_t avnd_su_pres_terming_compinst_h
avnd_su_pres_state_set(su,
SA_AMF_PRESENCE_INSTANTIATED);
}
}
+ else {
+ TRACE(NPI SU:'%s',su-name.value);
+ if (!m_AVND_SU_IS_FAILED(su) || (cb-oper_state ==
SA_AMF_OPERATIONAL_DISABLED))
+ goto done;
+ si = (AVND_SU_SI_REC *)m_NCS_DBLIST_FIND_FIRST(su-si_list);
+ osafassert(si);
+ /* Clean up/terminate components when they move to other than
instantiating state. */
+ for (csi = (AVND_COMP_CSI_REC
*)m_NCS_DBLIST_FIND_FIRST(si-csi_list);
+ csi; csi = (AVND_COMP_CSI_REC
*)m_NCS_DBLIST_FIND_NEXT(csi-si_dll_node)) {
+ if (m_AVND_COMP_PRES_STATE_IS_INSTANTIATING(csi-comp))
+ goto done;
+ }
+
+ csi = (AVND_COMP_CSI_REC
*)m_NCS_DBLIST_FIND_LAST(si-csi_list);
+ if (m_AVND_SU_SI_CURR_ASSIGN_STATE_IS_REMOVING(si))
+ m_AVND_COMP_CSI_CURR_ASSIGN_STATE_SET(csi,
AVND_COMP_CSI_ASSIGN_STATE_REMOVING);
+ else
+ m_AVND_COMP_CSI_CURR_ASSIGN_STATE_SET(csi,
AVND_COMP_CSI_ASSIGN_STATE_ASSIGNING);
+ m_AVND_SEND_CKPT_UPDT_ASYNC_UPDT(cb, csi,
AVND_CKPT_COMP_CSI_CURR_ASSIGN_STATE);
+
+ rc = avnd_comp_clc_fsm_run(cb, csi-comp,
(m_AVND_COMP_IS_FAILED(csi-comp)) ?
+ AVND_COMP_CLC_PRES_FSM_EV_CLEANUP :
AVND_COMP_CLC_PRES_FSM_EV_TERM);
+ if (NCSCC_RC_SUCCESS != rc)
+ LOG_ER(Termination of '%s'
failed,csi-comp-name.value);
+ }
+done:
TRACE_LEAVE2(%u, rc);
return rc;
--
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
