osaf/services/saf/amf/amfnd/clc.cc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
SIs are not assigned to SUs when component's rejection of active
assignment leads to su-failover during si-swap (SI dependency is enabled).
When si-swap is in progress it gives active assignment to the standby SU for
dependents after active becomes quiesced.One of the components rejects
active assignment and AMFND executes su-failover recovery.
During su-failover recovery, AMFND is reporting success
for active assignments on the faulty component when it gets cleaned
up successfully.
In su-failover all assignments will be failovered without
quiesced and removed state by AMFD when it gets su-failover request
from AMFND. Since AMFND reports susi sucess, AMFD gives standby assignments
to SU1. Instead AMFND should directly send su-failover request to AMFD and
AMFD will give active assignment back to quiesced SU1.
Patch ensures that AMFND will not send SUSI success to AMFD when components
fault with su-failover recovery during assignments.
diff --git a/osaf/services/saf/amf/amfnd/clc.cc
b/osaf/services/saf/amf/amfnd/clc.cc
--- a/osaf/services/saf/amf/amfnd/clc.cc
+++ b/osaf/services/saf/amf/amfnd/clc.cc
@@ -2095,11 +2095,12 @@ uint32_t avnd_comp_clc_terming_cleansucc
}
/*
- * su-sis may be in assigning/removing state. signal csi
- * assign/remove done so that su-si assignment/removal algo can proceed.
+ * su-sis may be in assigning/removing state. Except su-failover case,
+ * signal csi assign/remove done so that su-si assignment/removal algo
+ * can proceed.
*/
- avnd_comp_cmplete_all_assignment(cb, comp);
-
+ if (sufailover_in_progress(su) == false)
+ avnd_comp_cmplete_all_assignment(cb, comp);
avnd_comp_curr_info_del(cb, comp);
/* reset the comp-reg & instantiate params */
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
