Yes thanks.
I will introduce an 'else' branch before pushing.
/AndersBj
Zoran Milinkovic wrote:
> On every 100000 objects, the same message will be written twice to the log.
> Ack when the comment is fixed.
>
> Best regards,
> Zoran
>
> -----Original Message-----
> From: Anders Björnerstedt
> Sent: den 8 september 2014 11:28
> To: reddy.neelaka...@oracle.com; Zoran Milinkovic
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: [PATCH 1 of 1] IMM: Reduce log severity database size messages [#866]
>
> osaf/services/saf/immsv/immnd/ImmModel.cc | 40
> +++++++++++++++++++++++-------
> 1 files changed, 30 insertions(+), 10 deletions(-)
>
>
> The IMMND logs database size at certain threshold levels. The log severity
> for these mesages was set to WArning as early as 5000 objects. The warning
> severity should only be used when events occur that are unexpected or
> potentially dangerous.
>
> This changeset fixes so that:
>
> For every even 1000 creates a trace message is generated.
> For every even 10000 creates an INfo syslog message is generated.
> For every even 100000 creates a NOtice syslog message is generated.
>
> In addition to this, if the number of objects exceeds 350000, then:
>
> For every even 10000 creates a WArning syslog message is generated.
> For every even 100000 creates a WArning syslog message is generated.
>
> Thus warning messages are only printed when database size exceeds the
> recommended maximum size.
>
> diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
> b/osaf/services/saf/immsv/immnd/ImmModel.cc
> --- a/osaf/services/saf/immsv/immnd/ImmModel.cc
> +++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
> @@ -2470,11 +2470,11 @@ ImmModel::setLoader(int pid)
> }
>
> if (accessControlMode() == ACCESS_CONTROL_DISABLED) {
> - LOG_WA("IMM Access Control mode is DISABLED!");
> + LOG_WA("IMM Access Control mode is DISABLED!");
> } else if (accessControlMode() == ACCESS_CONTROL_PERMISSIVE) {
> - LOG_WA("IMM Access Control mode is PERMISSIVE");
> - } else {
> - LOG_NO("IMM Access Control mode is ENFORCING");
> + LOG_WA("IMM Access Control mode is PERMISSIVE");
> + } else {
> + LOG_NO("IMM Access Control mode is ENFORCING");
> }
>
> } else {
> @@ -3474,12 +3474,13 @@ ImmModel::accessControlMode()
> ObjectInfo* immObject = oi->second;
> ImmAttrValueMap::iterator avi =
> immObject->mAttrValueMap.find(immAccessControlMode);
> - if (avi == immObject->mAttrValueMap.end())
> - return ACCESS_CONTROL_DISABLED;
> + if (avi == immObject->mAttrValueMap.end()) {
> + return ACCESS_CONTROL_DISABLED;
> + }
> osafassert(!(avi->second->isMultiValued()));
> ImmAttrValue* valuep = avi->second;
> OsafImmAccessControlModeT accessControlMode =
> - static_cast<OsafImmAccessControlModeT>(valuep->getValue_int());
> + static_cast<OsafImmAccessControlModeT>(valuep->getValue_int());
>
> TRACE_LEAVE2("%u", accessControlMode);
> return accessControlMode;
> @@ -3498,8 +3499,9 @@ ImmModel::authorizedGroup()
> ObjectInfo* immObject = oi->second;
> ImmAttrValueMap::iterator avi =
> immObject->mAttrValueMap.find(immAuthorizedGroup);
> - if (avi == immObject->mAttrValueMap.end())
> - return NULL;
> + if (avi == immObject->mAttrValueMap.end()) {
> + return NULL;
> + }
> osafassert(!(avi->second->isMultiValued()));
> ImmAttrValue* valuep = avi->second;
> const char *adminGroupName = valuep->getValueC_str(); @@ -7452,8
> +7454,26 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im
>
> unsigned int sze = (unsigned int) sObjectMap.size();
> if(sze >= 5000) {
> + bool warn = sze > 350000;
> +
> + if(sze%100000 == 0) {
> + if(warn) {
> + LOG_WA("Number of objects in IMM is:%u", sze);
> + } else {
> + LOG_NO("Number of objects in IMM is:%u", sze);
> + }
> + }
> +
> + if(sze%10000 == 0) {
> + if(warn) {
> + LOG_WA("Number of objects in IMM is:%u", sze);
> + } else {
> + LOG_IN("Number of objects in IMM is:%u", sze);
> + }
> + }
> +
> if(sze%1000 == 0) {
> - LOG_WA("Number of objects in IMM is:%u", sze);
> + TRACE("Number of objects in IMM is:%u", sze);
> }
> }
>
>
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
