Re: [devel] [PATCH 1/1] log: Fix cyclic crash when starting standby and OI is not active [#2711]

2018-03-01 Thread Lennart Lund
Hi Vu

Your comment is correct. I will fix this (and the version problem) and update 
the review (easiest way of showing the fix)

Thanks
Lennart

> -Original Message-
> From: Vu Minh Nguyen [mailto:vu.m.ngu...@dektech.com.au]
> Sent: den 1 mars 2018 11:07
> To: Lennart Lund ; Canh Van Truong
> 
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: RE: [PATCH 1/1] log: Fix cyclic crash when starting standby and OI is
> not active [#2711]
> 
> Hi Lennart,
> 
> See my response inline, started with [Vu2]
> 
> Regards, Vu
> 
> > -Original Message-
> > From: Lennart Lund [mailto:lennart.l...@ericsson.com]
> > Sent: Wednesday, February 28, 2018 8:20 PM
> > To: Vu Minh Nguyen ; Canh Van Truong
> > ; Lennart Lund
> 
> > Cc: opensaf-devel@lists.sourceforge.net
> > Subject: RE: [PATCH 1/1] log: Fix cyclic crash when starting standby and
> OI is
> > not active [#2711]
> >
> >
> >
> > > -Original Message-
> > > From: Vu Minh Nguyen [mailto:vu.m.ngu...@dektech.com.au]
> > > Sent: den 28 februari 2018 08:10
> > > To: Lennart Lund ; Canh Van Truong
> > > 
> > > Cc: opensaf-devel@lists.sourceforge.net
> > > Subject: RE: [PATCH 1/1] log: Fix cyclic crash when starting standby and
> OI is
> > > not active [#2711]
> > >
> > > Hi Lennart,
> > >
> > > See my comments inline, with [Vu].
> > >
> > > Regards, Vu
> > >
> > > > -Original Message-
> > > > From: Lennart Lund [mailto:lennart.l...@ericsson.com]
> > > > Sent: Monday, February 26, 2018 8:40 PM
> > > > To: vu.m.ngu...@dektech.com.au; canh.v.tru...@dektech.com.au
> > > > Cc: opensaf-devel@lists.sourceforge.net; Lennart Lund
> > > > 
> > > > Subject: [PATCH 1/1] log: Fix cyclic crash when starting standby and
> OI is
> > > not
> > > > active [#2711]
> > > >
> > > > Fix cyclic reboot caused by reading an IMM RT object when the OI is
> down
> > > > ---
> > > >  src/log/apitest/logtest.c  |  2 --
> > > >  src/log/logd/lgs_config.cc |  2 +-
> > > >  src/log/logd/lgs_evt.cc| 13 ++---
> > > >  src/log/logd/lgs_fmt.h |  3 ++-
> > > >  src/log/logd/lgs_imm.cc| 13 +++--
> > > >  src/log/logd/lgs_mbcsv.cc  | 18 --
> > > >  src/log/logd/lgs_mbcsv.h   |  3 ++-
> > > >  src/log/logd/lgs_recov.cc  |  6 --
> > > >  src/log/logd/lgs_stream.cc | 28 +++-
> > > >  src/log/logd/lgs_stream.h  |  2 +-
> > > >  src/osaf/immutil/immutil.h |  4 +++-
> > > >  11 files changed, 41 insertions(+), 53 deletions(-)
> > > >
> > > > diff --git a/src/log/apitest/logtest.c b/src/log/apitest/logtest.c
> > > > index afa1fcf57..f8fe135cb 100644
> > > > --- a/src/log/apitest/logtest.c
> > > > +++ b/src/log/apitest/logtest.c
> > > > @@ -33,8 +33,6 @@
> > > >  #include "base/osaf_extended_name.h"
> > > >  #include 
> > > >
> > > > -#define LLDTEST
> > > > -
> > > >  SaNameT systemStreamName;
> > > >  SaNameT alarmStreamName;
> > > >  SaNameT globalConfig;
> > > > diff --git a/src/log/logd/lgs_config.cc b/src/log/logd/lgs_config.cc
> > > > index a70a2f6c6..4190e3048 100644
> > > > --- a/src/log/logd/lgs_config.cc
> > > > +++ b/src/log/logd/lgs_config.cc
> > > > @@ -586,7 +586,7 @@ int lgs_cfg_verify_log_file_format(const char
> > > > *log_file_format) {
> > > >SaBoolT dummy;
> > > >
> > > >if (!lgs_is_valid_format_expression((const
> SaStringT)log_file_format,
> > > > -  STREAM_TYPE_APPLICATION,
> )) {
> > > > +  STREAM_TYPE_APPLICATION_RT,
> > > )) {
> > > >  LOG_NO("logStreamFileFormat has invalid value = %s",
> > > log_file_format);
> > > >  rc = -1;
> > > >}
> > > > diff --git a/src/log/logd/lgs_evt.cc b/src/log/logd/lgs_evt.cc
> > > > index b8840b436..4b735875d 100644
> > > > --- a/src/log/logd/lgs_evt.cc
> > > > +++ b/src/log/logd/lgs_evt.cc
> > > > @@ -877,7 +877,7 @@ SaAisErrorT
> > > > create_new_app_stream(lgsv_stream_open_req_t
> *open_sync_param,
> > > >
> > > >/* Check the format string */
> > > >if (!lgs_is_valid_format_expression(open_sync_param->logFileFmt,
> > > > -  STREAM_TYPE_APPLICATION,
> > > > +  STREAM_TYPE_APPLICATION_RT,
> > > >)) {
> > > >  TRACE("format expression failure");
> > > >  rc = SA_AIS_ERR_INVALID_PARAM;
> > > > @@ -947,16 +947,15 @@ SaAisErrorT
> > > > create_new_app_stream(lgsv_stream_open_req_t
> *open_sync_param,
> > > >open_sync_param->logFileName, open_sync_param-
> > > >logFilePathName,
> > > >open_sync_param->maxLogFileSize, open_sync_param-
> > > > >maxLogRecordSize,
> > > >open_sync_param->logFileFullAction, open_sync_param-
> > > > >maxFilesRotated,
> > > > -  open_sync_param->logFileFmt, 

Re: [devel] [PATCH 1/1] log: Fix cyclic crash when starting standby and OI is not active [#2711]

2018-03-01 Thread Vu Minh Nguyen
Hi Lennart,

See my response inline, started with [Vu2]

Regards, Vu

> -Original Message-
> From: Lennart Lund [mailto:lennart.l...@ericsson.com]
> Sent: Wednesday, February 28, 2018 8:20 PM
> To: Vu Minh Nguyen ; Canh Van Truong
> ; Lennart Lund 
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: RE: [PATCH 1/1] log: Fix cyclic crash when starting standby and
OI is
> not active [#2711]
> 
> 
> 
> > -Original Message-
> > From: Vu Minh Nguyen [mailto:vu.m.ngu...@dektech.com.au]
> > Sent: den 28 februari 2018 08:10
> > To: Lennart Lund ; Canh Van Truong
> > 
> > Cc: opensaf-devel@lists.sourceforge.net
> > Subject: RE: [PATCH 1/1] log: Fix cyclic crash when starting standby and
OI is
> > not active [#2711]
> >
> > Hi Lennart,
> >
> > See my comments inline, with [Vu].
> >
> > Regards, Vu
> >
> > > -Original Message-
> > > From: Lennart Lund [mailto:lennart.l...@ericsson.com]
> > > Sent: Monday, February 26, 2018 8:40 PM
> > > To: vu.m.ngu...@dektech.com.au; canh.v.tru...@dektech.com.au
> > > Cc: opensaf-devel@lists.sourceforge.net; Lennart Lund
> > > 
> > > Subject: [PATCH 1/1] log: Fix cyclic crash when starting standby and
OI is
> > not
> > > active [#2711]
> > >
> > > Fix cyclic reboot caused by reading an IMM RT object when the OI is
down
> > > ---
> > >  src/log/apitest/logtest.c  |  2 --
> > >  src/log/logd/lgs_config.cc |  2 +-
> > >  src/log/logd/lgs_evt.cc| 13 ++---
> > >  src/log/logd/lgs_fmt.h |  3 ++-
> > >  src/log/logd/lgs_imm.cc| 13 +++--
> > >  src/log/logd/lgs_mbcsv.cc  | 18 --
> > >  src/log/logd/lgs_mbcsv.h   |  3 ++-
> > >  src/log/logd/lgs_recov.cc  |  6 --
> > >  src/log/logd/lgs_stream.cc | 28 +++-
> > >  src/log/logd/lgs_stream.h  |  2 +-
> > >  src/osaf/immutil/immutil.h |  4 +++-
> > >  11 files changed, 41 insertions(+), 53 deletions(-)
> > >
> > > diff --git a/src/log/apitest/logtest.c b/src/log/apitest/logtest.c
> > > index afa1fcf57..f8fe135cb 100644
> > > --- a/src/log/apitest/logtest.c
> > > +++ b/src/log/apitest/logtest.c
> > > @@ -33,8 +33,6 @@
> > >  #include "base/osaf_extended_name.h"
> > >  #include 
> > >
> > > -#define LLDTEST
> > > -
> > >  SaNameT systemStreamName;
> > >  SaNameT alarmStreamName;
> > >  SaNameT globalConfig;
> > > diff --git a/src/log/logd/lgs_config.cc b/src/log/logd/lgs_config.cc
> > > index a70a2f6c6..4190e3048 100644
> > > --- a/src/log/logd/lgs_config.cc
> > > +++ b/src/log/logd/lgs_config.cc
> > > @@ -586,7 +586,7 @@ int lgs_cfg_verify_log_file_format(const char
> > > *log_file_format) {
> > >SaBoolT dummy;
> > >
> > >if (!lgs_is_valid_format_expression((const
SaStringT)log_file_format,
> > > -  STREAM_TYPE_APPLICATION,
)) {
> > > +  STREAM_TYPE_APPLICATION_RT,
> > )) {
> > >  LOG_NO("logStreamFileFormat has invalid value = %s",
> > log_file_format);
> > >  rc = -1;
> > >}
> > > diff --git a/src/log/logd/lgs_evt.cc b/src/log/logd/lgs_evt.cc
> > > index b8840b436..4b735875d 100644
> > > --- a/src/log/logd/lgs_evt.cc
> > > +++ b/src/log/logd/lgs_evt.cc
> > > @@ -877,7 +877,7 @@ SaAisErrorT
> > > create_new_app_stream(lgsv_stream_open_req_t *open_sync_param,
> > >
> > >/* Check the format string */
> > >if (!lgs_is_valid_format_expression(open_sync_param->logFileFmt,
> > > -  STREAM_TYPE_APPLICATION,
> > > +  STREAM_TYPE_APPLICATION_RT,
> > >)) {
> > >  TRACE("format expression failure");
> > >  rc = SA_AIS_ERR_INVALID_PARAM;
> > > @@ -947,16 +947,15 @@ SaAisErrorT
> > > create_new_app_stream(lgsv_stream_open_req_t *open_sync_param,
> > >open_sync_param->logFileName, open_sync_param-
> > >logFilePathName,
> > >open_sync_param->maxLogFileSize, open_sync_param-
> > > >maxLogRecordSize,
> > >open_sync_param->logFileFullAction, open_sync_param-
> > > >maxFilesRotated,
> > > -  open_sync_param->logFileFmt, STREAM_TYPE_APPLICATION,
> > > twelveHourModeFlag,
> > > -  0,
> > > -  *o_stream);  // output
> > > +  open_sync_param->logFileFmt, STREAM_TYPE_APPLICATION_RT,
> > > +  twelveHourModeFlag, 0, *o_stream);  // output
> > >if (err == -1) {
> > >  log_stream_delete(o_stream);
> > >  rc = SA_AIS_ERR_NO_MEMORY;
> > >  goto done;
> > >}
> > >
> > > -  rc = lgs_create_rt_appstream(*o_stream);
> > > +  rc = lgs_create_appstream_rt_object(*o_stream);
> > >if (rc != SA_AIS_OK) log_stream_delete(o_stream);
> > >
> > >  done:
> > > @@ -1055,7 +1054,7 @@ static uint32_t proc_stream_open_msg(lgs_cb_t
> > > *cb, lgsv_lgs_evt_t *evt) {
> > >logStream = log_stream_get_by_name(name);
> > >if (logStream != nullptr) 

[devel] [PATCH 2/2] imm: return correct error code when working on more than 10000 objects [#2359]

2018-03-01 Thread srinivas
---
 src/imm/agent/imma_proc.cc | 16 
 src/imm/common/immsv_evt.c |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/imm/agent/imma_proc.cc b/src/imm/agent/imma_proc.cc
index af8fb58..8c53925 100644
--- a/src/imm/agent/imma_proc.cc
+++ b/src/imm/agent/imma_proc.cc
@@ -3542,15 +3542,15 @@ SaAisErrorT imma_evt_fake_evs(IMMA_CB *cb, IMMSV_EVT 
*i_evt, IMMSV_EVT **o_evt,
   /* Encode non-flat since we broadcast to unknown receivers. */
   proc_rc = immsv_evt_enc(i_evt, );
 
+  if (proc_rc == NCSCC_RC_NO_OBJECT) {
+TRACE_2("ERR_NO_RESOURCES: Failed to pre-pack");
+rc = SA_AIS_ERR_NO_RESOURCES;
+goto fail;
+  }
+
   if (proc_rc != NCSCC_RC_SUCCESS) {
-if (proc_rc != SA_AIS_ERR_NO_RESOURCES) {
-  rc = SA_AIS_ERR_LIBRARY;
-  TRACE_2("ERR_LIBRARY: Failed to pre-pack");
-}
-else {
-  rc = SA_AIS_ERR_NO_RESOURCES;
-  TRACE_2("ERR_NO_RESOURCES: Failed to pre-pack");
-}
+TRACE_2("ERR_LIBRARY: Failed to pre-pack");
+rc = SA_AIS_ERR_LIBRARY;
 goto fail;
   }
 
diff --git a/src/imm/common/immsv_evt.c b/src/imm/common/immsv_evt.c
index aef00d4..b0e36d3 100644
--- a/src/imm/common/immsv_evt.c
+++ b/src/imm/common/immsv_evt.c
@@ -775,7 +775,7 @@ static uint32_t immsv_evt_enc_name_list(NCS_UBAID *o_ub, 
IMMSV_OBJ_NAME_LIST *p)
 
if (objs >= IMMSV_MAX_OBJECTS) {
LOG_ER("TOO MANY Object Names line:%u", __LINE__);
-   return SA_AIS_ERR_NO_RESOURCES;
+   return NCSCC_RC_NO_OBJECT;
}
return NCSCC_RC_SUCCESS;
 }
-- 
2.7.4


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel


[devel] [PATCH 1/2] imm: return correct error code when working on more than 10000 objects [#2359]

2018-03-01 Thread srinivas
---
 src/imm/agent/imma_proc.cc | 10 --
 src/imm/common/immsv_evt.c |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/imm/agent/imma_proc.cc b/src/imm/agent/imma_proc.cc
index 886b50c..af8fb58 100644
--- a/src/imm/agent/imma_proc.cc
+++ b/src/imm/agent/imma_proc.cc
@@ -3543,8 +3543,14 @@ SaAisErrorT imma_evt_fake_evs(IMMA_CB *cb, IMMSV_EVT 
*i_evt, IMMSV_EVT **o_evt,
   proc_rc = immsv_evt_enc(i_evt, );
 
   if (proc_rc != NCSCC_RC_SUCCESS) {
-TRACE_2("ERR_LIBRARY: Failed to pre-pack");
-rc = SA_AIS_ERR_LIBRARY;
+if (proc_rc != SA_AIS_ERR_NO_RESOURCES) {
+  rc = SA_AIS_ERR_LIBRARY;
+  TRACE_2("ERR_LIBRARY: Failed to pre-pack");
+}
+else {
+  rc = SA_AIS_ERR_NO_RESOURCES;
+  TRACE_2("ERR_NO_RESOURCES: Failed to pre-pack");
+}
 goto fail;
   }
 
diff --git a/src/imm/common/immsv_evt.c b/src/imm/common/immsv_evt.c
index 88c5101..aef00d4 100644
--- a/src/imm/common/immsv_evt.c
+++ b/src/imm/common/immsv_evt.c
@@ -775,7 +775,7 @@ static uint32_t immsv_evt_enc_name_list(NCS_UBAID *o_ub, 
IMMSV_OBJ_NAME_LIST *p)
 
if (objs >= IMMSV_MAX_OBJECTS) {
LOG_ER("TOO MANY Object Names line:%u", __LINE__);
-   return NCSCC_RC_OUT_OF_MEM;
+   return SA_AIS_ERR_NO_RESOURCES;
}
return NCSCC_RC_SUCCESS;
 }
-- 
2.7.4


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel


[devel] [PATCH 0/2] Review Request for imm: return correct error code when working on more than 10000 objects [#2359]

2018-03-01 Thread srinivas
Summary: imm: return correct error code when working on more than 1 objects 
[#2359]
Review request for Ticket(s): 2359
Peer Reviewer(s): Vu, Zoran 
Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE ***
Affected branch(es): develop
Development branch: ticket-2359
Base revision: 5629f554686a498f328e0c79fc946379cbcf6967
Personal repository: git://git.code.sf.net/u/sri-mangipudy/review


Impacted area   Impact y/n

 Docsn
 Build systemn
 RPM/packaging   n
 Configuration files n
 Startup scripts n
 SAF servicesy
 OpenSAF servicesn
 Core libraries  n
 Samples n
 Tests   n
 Other   n


Comments (indicate scope for each "y" above):
-
 corrected the error code returned.

revision 3af8a18b4f8103a049bf3fa47b5475fab7f42374
Author: srinivas 
Date:   Thu, 1 Mar 2018 15:13:44 +0530

imm: return correct error code when working on more than 1 objects [#2359]



revision 8fced00ce0aec5650d8af6c4e69d952548aa046a
Author: srinivas 
Date:   Thu, 1 Mar 2018 15:13:44 +0530

imm: return correct error code when working on more than 1 objects [#2359]



Complete diffstat:
--
 src/imm/agent/imma_proc.cc | 6 ++
 src/imm/common/immsv_evt.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)


Testing Commands:
-
*** LIST THE COMMAND LINE TOOLS/STEPS TO TEST YOUR CHANGES ***


Testing, Expected Results:
--
*** PASTE COMMAND OUTPUTS / TEST RESULTS ***


Conditions of Submission:
-
*** HOW MANY DAYS BEFORE PUSHING, CONSENSUS ETC ***


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 ~/.gitconfig file (i.e. user.name, user.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.


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel


Re: [devel] [PATCH 1/1] dtm: change trace config var name to _PATHNAME [#2792]

2018-03-01 Thread Vu Minh Nguyen
Ack with a  minor comment, with [Vu].

Regards, Vu

> -Original Message-
> From: srinivas [mailto:srinivas.mangip...@oracle.com]
> Sent: Thursday, March 1, 2018 2:31 PM
> To: anders.wid...@ericsson.com; vu.m.ngu...@dektech.com.au
> Cc: opensaf-devel@lists.sourceforge.net; srinivas
> 
> Subject: [PATCH 1/1] dtm: change trace config var name to _PATHNAME
> [#2792]
> 
> ---
>  src/imm/README  | 9 ++---
>  src/imm/immloadd/imm_loader.cc  | 2 +-
>  src/imm/immnd/immnd.conf| 2 +-
>  src/imm/immpbed/immpbe.cc   | 2 +-
>  src/imm/tools/imm_dumper.cc | 2 +-
>  src/ntf/README  | 7 +--
>  src/ntf/ntfd/ntfd.conf  | 2 +-
>  src/ntf/ntfimcnd/ntfimcn_main.c | 2 +-
>  8 files changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/src/imm/README b/src/imm/README
> index ee5f8e8..750d811 100644
> --- a/src/imm/README
> +++ b/src/imm/README
> @@ -3206,12 +3206,12 @@ in immd.conf/immnd.conf and restart the cluster.
> 
>  Errors, warnings and notice level messages are logged to the syslog.
> 
> -To enable traces in the IMM library, export the variable
> IMMA_TRACE_FILENAME
> +To enable traces in the IMM library, export the variable
> IMMA_TRACE_PATHNAME
>  with a valid pathname before starting the application using the IMM
library.
[Vu] It may be good information for user to state here fixed location of
trace file as you already did for NTF README as below.
+Traces are always stored in $PKGLOGDIR directory and the directory
component
+of the path name (if any) is ignored.

In OpenSAF_IMMsv_PR.odt
(https://sourceforge.net/p/opensaf/documentation/ci/default/tree/OpenSAF_IMM
Sv_PR.odt),
There is a statement regarding agent trace, I guess we should consider to
update it too, chapter 3.6.2 Configuration:
" Tracing of he IMMA library is possible by defining the environment
variable IMMA_TRACE_PATHNAME. The variable should have a legal file path and
the trace will be appended to the file identified by that path"

> 
>  For example:
> 
> -$ export IMMA_TRACE_FILENAME=imm.trace
> +$ export IMMA_TRACE_PATHNAME=imm.trace
>  $ ./immomtest
>  $ cat $pkglogdir/imm.trace
> 
> @@ -3220,8 +3220,11 @@ It is also possible to trace slave processes forked
> by the IMMND.
>  This would be processes for loading, sync and dump/pbe.
>  To enable such trace uncomment:
> 
> -#export IMMSV_TRACE_FILENAME=osafimmnd
> +#export IMMSV_TRACE_PATHNAME=osafimmnd
> 
> +It is recommended to use osaflog command as it takes care of flushing
> +unwritten trace messages from memory to disk, as well as concatenating
> +the pieces that may have resulted from log rotation of the trace stream.
> 
>  TEST
> 
> diff --git a/src/imm/immloadd/imm_loader.cc
> b/src/imm/immloadd/imm_loader.cc
> index 13fb417..de5a575 100644
> --- a/src/imm/immloadd/imm_loader.cc
> +++ b/src/imm/immloadd/imm_loader.cc
> @@ -2507,7 +2507,7 @@ int main(int argc, char *argv[]) {
>  exit(1);
>}
> 
> -  if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
> +  if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
>  category_mask = 0x; /* TODO: set using env variable ? */
>} else {
>  logPath = defaultLog;
> diff --git a/src/imm/immnd/immnd.conf b/src/imm/immnd/immnd.conf
> index 9172677..b6a4823 100644
> --- a/src/imm/immnd/immnd.conf
> +++ b/src/imm/immnd/immnd.conf
> @@ -12,7 +12,7 @@
>  # they attach as IMMA clients. These processes will also route trace to
the
>  # IMMND trace-file as define here. Traces are always stored in $PKGLOGDIR
>  # directory and the directory component of the path name (if any) is
ignored.
> -#export IMMSV_TRACE_FILENAME=osafimmnd
> +#export IMMSV_TRACE_PATHNAME=osafimmnd
> 
>  # The directory where the imm.xml files and persistend backend files are
>  # stored. Imm dump files may also be stored here or in a subdirectory.
> diff --git a/src/imm/immpbed/immpbe.cc b/src/imm/immpbed/immpbe.cc
> index 6e9b933..964086f 100644
> --- a/src/imm/immpbed/immpbe.cc
> +++ b/src/imm/immpbed/immpbe.cc
> @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
>const SaImmAdminOperationParamsT_2* params[] = {NULL};
>SaImmAdminOperationParamsT_2** retParams = NULL;
> 
> -  if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
> +  if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
>  category_mask = 0x; /* TODO: set using -t flag ? */
>} else {
>  logPath = defaultLog;
> diff --git a/src/imm/tools/imm_dumper.cc b/src/imm/tools/imm_dumper.cc
> index 5e5dd00..0365fc7 100644
> --- a/src/imm/tools/imm_dumper.cc
> +++ b/src/imm/tools/imm_dumper.cc
> @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) {
> * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize
> */
>osaf_extended_name_init();
> 
> -  if ((logPath = getenv("IMMSV_TRACE_FILENAME"))) {
> +  if ((logPath = getenv("IMMSV_TRACE_PATHNAME"))) {
>  category_mask = 0x; /* TODO: set using -t flag ? */
>} else {
>  logPath = defaultLog;
> diff