Hi Hung, Ack from me with a minor comment.
SA_IMM_ATTR_STRONG_DEFAULT should not be combined with SA_IMM_ATTR_RN. This small check can be added to IMMA for the performance issue. Thanks, Zoran -----Original Message----- From: Hung Nguyen [mailto:[email protected]] Sent: Tuesday, September 22, 2015 7:05 PM To: Anders Björnerstedt; Zoran Milinkovic; [email protected] Cc: [email protected] Subject: [PATCH 1 of 4] imm: Introduce SA_IMM_ATTR_STRONG_DEFAULT flag [#1425] osaf/libs/agents/saf/imma/imma_om_api.c | 6 ++++++ osaf/libs/common/immsv/immpbe_dump.cc | 3 ++- osaf/libs/saf/include/saImmOm_A_2_16.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletions(-) SA_IMM_ATTR_STRONG_DEFAULT flag is supported in version A.02.16 or higher. diff --git a/osaf/libs/agents/saf/imma/imma_om_api.c b/osaf/libs/agents/saf/imma/imma_om_api.c --- a/osaf/libs/agents/saf/imma/imma_om_api.c +++ b/osaf/libs/agents/saf/imma/imma_om_api.c @@ -4766,6 +4766,12 @@ SaAisErrorT saImmOmClassCreate_2(SaImmHa goto mds_send_fail; } + if ((attr->attrFlags & SA_IMM_ATTR_STRONG_DEFAULT) && !(cl_node->isImmA2x10)) { + TRACE_2("SA_IMM_ATTR_STRONG_DEFAULT flag is supported in version A.02.16 or higher"); + rc = SA_AIS_ERR_VERSION; + goto mds_send_fail; + } + IMMSV_ATTR_DEF_LIST *p = /*alloc-2 */ malloc(sizeof(IMMSV_ATTR_DEF_LIST)); memset(p, 0, sizeof(IMMSV_ATTR_DEF_LIST)); diff --git a/osaf/libs/common/immsv/immpbe_dump.cc b/osaf/libs/common/immsv/immpbe_dump.cc --- a/osaf/libs/common/immsv/immpbe_dump.cc +++ b/osaf/libs/common/immsv/immpbe_dump.cc @@ -3237,7 +3237,8 @@ static int pbeAuditAttributeFlags(sqlite | SA_IMM_ATTR_NOTIFY | SA_IMM_ATTR_NO_DANGLING | SA_IMM_ATTR_DN - | SA_IMM_ATTR_DEFAULT_REMOVED; + | SA_IMM_ATTR_DEFAULT_REMOVED + | SA_IMM_ATTR_STRONG_DEFAULT; const char *sql = "select class_name, attr_name, attr_flags " "from attr_def, classes " "where (attr_flags & ~%lu) != 0 " diff --git a/osaf/libs/saf/include/saImmOm_A_2_16.h b/osaf/libs/saf/include/saImmOm_A_2_16.h --- a/osaf/libs/saf/include/saImmOm_A_2_16.h +++ b/osaf/libs/saf/include/saImmOm_A_2_16.h @@ -58,6 +58,9 @@ extern "C" { #define SA_IMM_ATTR_DEFAULT_REMOVED 0x0000000010000000 /* See: https://sourceforge.net/p/opensaf/tickets/1471 Supported in OpenSaf 4.7 */ +#define SA_IMM_ATTR_STRONG_DEFAULT 0x0000000020000000 /* See: https://sourceforge.net/p/opensaf/tickets/1425 + Supported in +OpenSaf 4.7 */ + #ifdef __cplusplus ------------------------------------------------------------------------------ Monitor Your Dynamic Infrastructure at Any Scale With Datadog! Get real-time metrics from all of your servers, apps and tools in one place. SourceForge users - Click here to start your Free Trial of Datadog now! http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140 _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
