Ack,
This check was previously in avd_su_db_add but got removed with the new db
Thanks,
Hans

> -----Original Message-----
> From: praveen.malv...@oracle.com [mailto:praveen.malv...@oracle.com]
> Sent: den 30 maj 2014 13:20
> To: Hans Feldt; nagendr...@oracle.com
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: [PATCH 1 of 1] amfd : avoid adding existing SU in su_db [#713]
> 
>  osaf/services/saf/amf/amfd/su.cc |  6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> 
> Standby AMF crashes while adding SU in its database.
> 
> This got introduced in changeset 5166 {#713]. The problem is standby AMFD is 
> inserting
> a SU in su_db which has already been created in MBCSV checkpointing.
> 
> Avoid adding SU in SU databse if it already exists.
> 
> 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
> @@ -598,8 +598,10 @@ static void su_add_to_model(AVD_SU *su)
>       su->sg_of_su = avd_sg_get(&dn);
>       osafassert(su->sg_of_su);
> 
> -     rc = su_db->insert(su);
> -     osafassert(rc == NCSCC_RC_SUCCESS);
> +     if (su_db->find(&su->name) == NULL) {
> +             rc = su_db->insert(su);
> +             osafassert(rc == NCSCC_RC_SUCCESS);
> +     }
>       su->su_type = avd_sutype_get(&su->saAmfSUType);
>       osafassert(su->su_type);
>       avd_sutype_add_su(su);

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to