Re: [devel] [PATCH 1 of 4] clm: add to the information model and update config, scripts [#220]
> saVersion=1 would be better
>
> adding 4.0.0 was a mistake I did
Wel, 4.0.0 is still && can-be considered as a baseline version!
I suggest let's leave it at 4.0.0 itself, and increment everybody in the next
release
Or probably increment everybody in this release itself?!( I remember that is how
We had discussed when we introduced this during 4.0, i.e. to manage
These versions during releases!)
- Mathi.
> -Original Message-
> From: Hans Feldt [mailto:hans.fe...@ericsson.com]
> Sent: Friday, December 13, 2013 1:29 PM
> To: Mathivanan Naickan Palanivelu; Ramesh Babu Betham
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: Re: [devel] [PATCH 1 of 4] clm: add to the information model and
> update config, scripts [#220]
>
>
>
> On 12/04/2013 02:00 PM, mathi.naic...@oracle.com wrote:
> > opensaf.spec.in | 1 +
> > osaf/services/saf/clmsv/config/Makefile.am | 3 +-
> > osaf/services/saf/clmsv/config/clmna.conf| 14 ++
> > osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
>
> > osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
> > osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
> > osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
> > 7 files changed, 157 insertions(+), 1 deletions(-)
> >
> >
> > diff --git a/opensaf.spec.in b/opensaf.spec.in
> > --- a/opensaf.spec.in
> > +++ b/opensaf.spec.in
> > @@ -1014,6 +1014,7 @@ fi
> > %defattr(-,root,root)
> > %dir %{_pkgclcclidir}
> > %dir %{_pkglibdir}
> > +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
> > %{_pkglibdir}/osafclmna
> > %{_pkgclcclidir}/osaf-noded
> >
> > diff --git a/osaf/services/saf/clmsv/config/Makefile.am
> > b/osaf/services/saf/clmsv/config/Makefile.am
> > --- a/osaf/services/saf/clmsv/config/Makefile.am
> > +++ b/osaf/services/saf/clmsv/config/Makefile.am
> > @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
> > MAINTAINERCLEANFILES = Makefile.in
> >
> > dist_pkgsysconf_DATA = \
> > - $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
> > + $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
> > + $(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
> >
> > if ENABLE_IMMXML
> >
> > diff --git a/osaf/services/saf/clmsv/config/clmna.conf
> > b/osaf/services/saf/clmsv/config/clmna.conf
> > new file mode 100644
> > --- /dev/null
> > +++ b/osaf/services/saf/clmsv/config/clmna.conf
> > @@ -0,0 +1,14 @@
> > +# This file contains configuration for the SAF CLM service # See the
> > +file services/clmsv/README for more configuration options.
> > +
> > +# Uncomment the next line if you want to run the CLM server through
> > +valgrind #export TOOL="valgrind --leak-check=full --log-
> file=/tmp/log.valgrind"
> > +
> > +# Uncomment the next line to enable trace
> > +#args="--tracemask=0x"
> > +
> > +# Healthcheck keys
> > +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
> > +
> > +# Uncomment the next line to enable info level logging
> > +#args="--loglevel=info"
> > diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> > b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> > --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> > +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> > @@ -106,4 +106,89 @@
> > 1
> >
> >
> > +
> > +
> > + safCompType=OpenSafCompTypeCLMNA
>
> CLMND?
>
> > +
> > +
> > +
> safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA n>
>
> saVersion=1 would be better
>
> adding 4.0.0 was a mistake I did
>
> > +
> > + saAmfCtSwBundle
> > + safSmfBundle=OpenSAF
> > +
> > +
> > + saAmfCtCompCategory
> > + 1
> > +
> > +
> > + saAmfCtDefClcCliTimeout
> > + 100
> > +
> > +
> > + saAmfCtDefCallbackTimeout
> > + 100
> > +
> > +
> > + saAmfCtRelPathInstantiateCmd
> > + osaf-noded
>
> and then noded?
>
> > +
> > +
> > + saAmfCtDefInstantiateCmdArgv
> > + instantiate
> > +
> > +
> > +saAmfCtDefInstantiationLevel
> > +2
> > +
> > +
> > + saAmfCtRelPathCleanupCmd
> > + osaf-clmd
> > +
> > +
> > + saAmfCtDefCleanupCmdArgv
> > + stop
> > +
> > +
> > +
> saAmfCtDefQuiescingCompleteTimeout
> > + 100
> > +
> > +
> > + saAmfCtDefRecoveryOnError
> > + 6
> > +
> > +
> > +
Re: [devel] [PATCH 1 of 1] build: Add extra GCC hardening compilation flags [#650]
The page is explaining more about the "order" of these flags. My interest in this page was more to do with the order in which these flags would get 'applied' on to the AM_**flags (and not in the context of C or C++!!) Basically wanted to be sure of any further chance of 'overwriding' of these flags. Cheers, Mathi. > -Original Message- > From: Anders Widell [mailto:anders.wid...@ericsson.com] > Sent: Friday, December 13, 2013 9:28 PM > To: Mathivanan Naickan Palanivelu > Cc: opensaf-devel@lists.sourceforge.net > Subject: Re: [PATCH 1 of 1] build: Add extra GCC hardening compilation flags > [#650] > > It was an interesting page; I haven't read it before. Btw the name CPPFLAGS > could be confusing at first: "CPP" stands for C PreProcessor, not "C Plus > Plus". > So it applies to both C and C++ code. > > regards, > Anders Widell > > 2013-12-13 11:34, Mathivanan Naickan Palanivelu skrev: > > Ack. > > I was going through this link to review this patch. > > http://www.gnu.org/software/automake/manual/html_node/Flag- > Variables-O > > rdering.html > > It might be of interest to you too. > > Basically, I wanted to figure out whether CPP_FLAGS should be passed > > to AM_CPP FLAGS or to AM_CXX FLAGS. > > - Mathi. > > > >> -Original Message- > >> From: Anders Widell [mailto:anders.wid...@ericsson.com] > >> Sent: Monday, December 09, 2013 5:15 PM > >> To: Mathivanan Naickan Palanivelu > >> Cc: opensaf-devel@lists.sourceforge.net > >> Subject: [PATCH 1 of 1] build: Add extra GCC hardening compilation > >> flags [#650] > >> > >> 00-README.conf | 2 +- > >> Makefile.common | 4 ++-- > >> README | 16 > >> configure.ac | 18 ++ > >> tools/cluster_sim_uml/README | 2 +- > >> 5 files changed, 34 insertions(+), 8 deletions(-) > >> > >> > >> By default, build with the extra hardening flags "-D_FORTIFY_SOURCE=2 > >> -fstack-protector" for improved security and enhanced run-time error > >> detection. The flags can be overridden by setting the environment > >> variable OSAF_HARDEN_FLAGS when building OpenSAF. > >> > >> Note that -D_FORTIFY_SOURCE=2 is only enabled in optimized builds. To > >> reduce the risk that a user accidentally builds without optimization > >> by overriding the default CFLAGS and/or CXXFLAGS, the README files > >> have been updated to recommend passing preprocessor definitions using > >> CPPFLAGS instead of CFLAGS. > >> > >> diff --git a/00-README.conf b/00-README.conf > >> --- a/00-README.conf > >> +++ b/00-README.conf > >> @@ -85,7 +85,7 @@ file does not have to be changed unless: > >> - OpenSAF should run as a different UNIX group and user than the > >> default 'opensaf' > >> group/user. > >> > >> - If OpenSAF was built with the flags "CFLAGS=-DRUNASROOT", then > >> + If OpenSAF was built with the flags "CPPFLAGS=-DRUNASROOT", > >> then > >>change OPENSAF_GROUP and OPENSAF_USER to root i.e. for old > >> (<4.2) behaviour. > >> > >>For any other user, change OPENSAF_GROUP and OPENSAF_USER > >> accordingly diff --git a/Makefile.common b/Makefile.common > >> --- a/Makefile.common > >> +++ b/Makefile.common > >> @@ -12,8 +12,8 @@ AM_CPPFLAGS = \ > >>$(CORE_INCLUDES) \ > >>$(all_includes) > >> > >> -AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC -AM_CXXFLAGS = > >> -Wall -fno-strict-aliasing -Werror -fPIC - D__STDC_FORMAT_MACROS > >> +AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC > >> @OSAF_HARDEN_FLAGS@ > >> +AM_CXXFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC - > >> D__STDC_FORMAT_MACROS @OSAF_HARDEN_FLAGS@ > >> AM_LDFLAGS = -ldl -lrt -lpthread > >> > >> # > >> diff --git a/README b/README > >> --- a/README > >> +++ b/README > >> @@ -293,7 +293,7 @@ 1.1.1, 1.1.2 etc. > >> To re-enable the old (pre 4.3) non flat addressing, configure the > >> constant > >> MDS_USE_SUBSLOT_ID=1 at configure time as in: > >> > >> -% ./configure CFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." > >> +% ./configure CPPFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." > >> > >> In the non flat scheme, the slot ID is shifted up 4 bits and subslot ID > >> is > >> added in the 4 LSB. The consequence of this is reduced number of @@ > >> -308,7 +308,7 @@ 2) Run as root (optional) > >> If the old (<4.2) behaviour of running all processes as root is desired, > >> use > >> the following configure command: > >> > >> -% ./configure CFLAGS=-DRUNASROOT > >> +% ./configure CPPFLAGS=-DRUNASROOT > >> > >> > >> 3) Configure TIPC importance (optional) @@ -317,13 +317,21 @@ The > >> default TIPC importance is LOW for a > >> In some cases the default importance must be changed if e.g. an > >> application starves the LOW importance communication level. > >> To change the default importance, use the following configure > >> command > >> > >> - % ./configure CFLAGS=-DTIPCIMPORTANCE=level > >> + % ./configure CPPFLAGS=-DTIPCIMPORTANCE=level > >> where level is
Re: [devel] [PATCH 1 of 1] build: Add extra GCC hardening compilation flags [#650]
It was an interesting page; I haven't read it before. Btw the name CPPFLAGS could be confusing at first: "CPP" stands for C PreProcessor, not "C Plus Plus". So it applies to both C and C++ code. regards, Anders Widell 2013-12-13 11:34, Mathivanan Naickan Palanivelu skrev: > Ack. > I was going through this link to review this patch. > http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html > It might be of interest to you too. > Basically, I wanted to figure out whether CPP_FLAGS should be passed to > AM_CPP FLAGS or > to AM_CXX FLAGS. > - Mathi. > >> -Original Message- >> From: Anders Widell [mailto:anders.wid...@ericsson.com] >> Sent: Monday, December 09, 2013 5:15 PM >> To: Mathivanan Naickan Palanivelu >> Cc: opensaf-devel@lists.sourceforge.net >> Subject: [PATCH 1 of 1] build: Add extra GCC hardening compilation flags >> [#650] >> >> 00-README.conf | 2 +- >> Makefile.common | 4 ++-- >> README | 16 >> configure.ac | 18 ++ >> tools/cluster_sim_uml/README | 2 +- >> 5 files changed, 34 insertions(+), 8 deletions(-) >> >> >> By default, build with the extra hardening flags "-D_FORTIFY_SOURCE=2 >> -fstack-protector" for improved security and enhanced run-time error >> detection. The flags can be overridden by setting the environment variable >> OSAF_HARDEN_FLAGS when building OpenSAF. >> >> Note that -D_FORTIFY_SOURCE=2 is only enabled in optimized builds. To >> reduce the >> risk that a user accidentally builds without optimization by overriding the >> default CFLAGS and/or CXXFLAGS, the README files have been updated to >> recommend >> passing preprocessor definitions using CPPFLAGS instead of CFLAGS. >> >> diff --git a/00-README.conf b/00-README.conf >> --- a/00-README.conf >> +++ b/00-README.conf >> @@ -85,7 +85,7 @@ file does not have to be changed unless: >> - OpenSAF should run as a different UNIX group and user than the default >> 'opensaf' >> group/user. >> >> -If OpenSAF was built with the flags "CFLAGS=-DRUNASROOT", then >> +If OpenSAF was built with the flags "CPPFLAGS=-DRUNASROOT", >> then >> change OPENSAF_GROUP and OPENSAF_USER to root i.e. for old >> (<4.2) behaviour. >> >> For any other user, change OPENSAF_GROUP and OPENSAF_USER >> accordingly >> diff --git a/Makefile.common b/Makefile.common >> --- a/Makefile.common >> +++ b/Makefile.common >> @@ -12,8 +12,8 @@ AM_CPPFLAGS = \ >> $(CORE_INCLUDES) \ >> $(all_includes) >> >> -AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC >> -AM_CXXFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC - >> D__STDC_FORMAT_MACROS >> +AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC >> @OSAF_HARDEN_FLAGS@ >> +AM_CXXFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC - >> D__STDC_FORMAT_MACROS @OSAF_HARDEN_FLAGS@ >> AM_LDFLAGS = -ldl -lrt -lpthread >> >> # >> diff --git a/README b/README >> --- a/README >> +++ b/README >> @@ -293,7 +293,7 @@ 1.1.1, 1.1.2 etc. >> To re-enable the old (pre 4.3) non flat addressing, configure the constant >> MDS_USE_SUBSLOT_ID=1 at configure time as in: >> >> -% ./configure CFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." >> +% ./configure CPPFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." >> >> In the non flat scheme, the slot ID is shifted up 4 bits and subslot ID is >> added in the 4 LSB. The consequence of this is reduced number of >> @@ -308,7 +308,7 @@ 2) Run as root (optional) >> If the old (<4.2) behaviour of running all processes as root is desired, >> use >> the following configure command: >> >> -% ./configure CFLAGS=-DRUNASROOT >> +% ./configure CPPFLAGS=-DRUNASROOT >> >> >> 3) Configure TIPC importance (optional) >> @@ -317,13 +317,21 @@ The default TIPC importance is LOW for a >> In some cases the default importance must be changed if e.g. an application >> starves the LOW importance communication level. >> To change the default importance, use the following configure command >> >> - % ./configure CFLAGS=-DTIPCIMPORTANCE=level >> + % ./configure CPPFLAGS=-DTIPCIMPORTANCE=level >> where level is any of TIPC_LOW_IMPORTANCE, >> TIPC_MEDIUM_IMPORTANCE or TIPC_HIGH_IMPORTANCE >> - e.g. configure CFLAGS=-DTIPCIMPORTANCE=TIPC_HIGH_IMPORTANCE >> + e.g. configure CPPFLAGS=-DTIPCIMPORTANCE=TIPC_HIGH_IMPORTANCE >> >> Note: Giving same importance to AVND & all other Opensaf models is not >> preferred option. The behavior is unsupported. >> >> >> +4) Configure GCC hardening options (optional) >> + >> +By default, the options "-fstack-protector -D_FORTIFY_SOURCE=2" are >> passed to >> +GCC for improved security. You can override these options by setting the >> +OSAF_HARDEN_FLAGS when configuring OpenSAF. For example: >> + >> + % ./configure OSAF_HARDEN_FLAGS="-fstack-protector-all - >> D_FORTIFY_SOURCE=2" >> + >> If you are using a released archive (dist tarball) follow the simple common >> steps: >> >> diff
Re: [devel] [PATCH 1 of 1] base: skip syslog in logtrace when nospc [#658]
Ack.
Maybe you could consider if it makes sense to do the following
improvement, though:
Log to syslog ONCE until the error goes away. This could be done for all
values of errno (execpt EAGAIN and EINTR) by introducing a flag. When
write fails, log to syslog once and set the flag. Don't log any more to
syslog as long as the flag is set. If write is successful again, clear
the flag.
BTW from a quick look this code seems to contain several problems (not
related to your patch). Why is it checking for EAGAIN when the file was
not opened non-blocking? Shouldn't it check for EINTR instead? And maybe
the file ought to be opened non-blocking? Further up in the code, I see
wrong usage of return value from snprintf and vsnprintf: these functions
return -1 on error, and they can return a value larger than maximum
buffer size in case the string would have overflowed the buffer. This is
not checked by the code! And the loop (why is it using goto instead of
an ordinary while loop, btw?) is wrong. If we get EAGAIN, the variable
"i" will have the value -1, which is used as size in the next call to
write(trace_fd, log_string, i). Sigh! Three bugs in the same function.
regards,
Anders Widell
2013-12-13 13:47, Hans Feldt skrev:
> osaf/libs/core/common/logtrace.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>
> diff --git a/osaf/libs/core/common/logtrace.c
> b/osaf/libs/core/common/logtrace.c
> --- a/osaf/libs/core/common/logtrace.c
> +++ b/osaf/libs/core/common/logtrace.c
> @@ -120,7 +120,7 @@ write_retry:
> if (i == -1) {
> if (errno == EAGAIN)
> goto write_retry;
> - else
> + else if (errno != ENOSPC)
> syslog(LOG_ERR, "logtrace: write failed, %s",
> strerror(errno));
> }
> }
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
[devel] [PATCH 1 of 1] smfd: smfBundleCheckCmd called as part of prerequisites test [656]
00-README.conf | 12 + osaf/services/saf/smfsv/scripts/smf-bundle-check | 139 ++ osaf/services/saf/smfsv/smfd/SmfCampState.cc | 90 ++ 3 files changed, 88 insertions(+), 153 deletions(-) Includes the invocation of the configured smfBundleCheckCmd command as a part of the prerequisites tests. The specified command is given the DN of the SaSmfSwBundle instance to check as argument. diff --git a/00-README.conf b/00-README.conf --- a/00-README.conf +++ b/00-README.conf @@ -408,4 +408,16 @@ Note: If resource limits are not configu (running in application context) will by default have/set a non-realtime priority with the scheduling policy of SCHED_OTHER. +SMF bundle check command += +SMF requires a command to be configured which is called to verify sw bundles invoked by the campaign. +The command is configured in the OpenSafSmfConfig attribute smfBundleCheckCmd. +From OpenSAF 4.4 the smfBundleCheckCmd command as a part of the prerequisites tests. +Interfacs: The specified command is given the DN of the SaSmfSwBundle instance to check as argument. + configuredCmd + e.g. myConfiguredCommand saSmfBundle=myBundle +Note: The OpenSAF default implemetation is located at osaf/services/saf/smfsv/scripts/smf-bundle-check. + Earlier default implementation of the command (which was never called from SMF) requires a bundle + name as input parameter. + From 4.4 the input parameter shall be the DN of the bundle to check. diff --git a/osaf/services/saf/smfsv/scripts/smf-bundle-check b/osaf/services/saf/smfsv/scripts/smf-bundle-check --- a/osaf/services/saf/smfsv/scripts/smf-bundle-check +++ b/osaf/services/saf/smfsv/scripts/smf-bundle-check @@ -15,142 +15,29 @@ # # Author(s): Ericsson AB # -# Default implementation of SMF bundle check - -# FROM THE SMF SPECIFICATION; +# This command is called during the prerequisites test described in: +# Service AvailabilityT Forum Application Interface Specification +# Software Management Framework SAI-AIS-SMF-A.01.02 +# 4.1.1 Upgrade Prerequisites +# Test 6. The desired version of the software is available in the software repository, and all +# the dependencies of the required packages have been checked and are satisfied. # -# 3.2.2.1 Repository Management +# This file contain the default implementation of SMF bundle check. +# The default implementation is just a placeholder for the sw bundle test call from SMF. +# The tests shall be written by the user to fit the actual system hosting OpenSAF. # -# It is assumed that an SA Forum system is associated with a -# logically single storage that collects all software bundles -# available in the system. In the software delivery phase, software -# bundles are made available to the system by copying them to the -# software repository. The source could be a remote file server, a -# CD, or some other media. The Software Management Framework -# specification currently does not specify how software packages -# and, as a consequence, software bundles are imported to the -# repository and made available to the system. +# Interface: The command is called with the sw budle DN as parameter. +#configuredCommand # -# When software bundles are delivered to the software repository, -# they should be verified in an implementation-specific way (for -# instance, by the use of package handling utilities of an operating -# system or by other means). This verification should include for -# each software bundle: -# -# - A check of the integrity and the origin of all software -# packages that make up the bundle. -# -# - A check that all other packages indicated in the package -# dependency list are available in the repository or have been -# delivered at the same time. -# -# - A check that the bundle has been properly added to the -# repository and can, therefore, be used as an installation -# source. -# -# When all these operations and checks are successfully completed, -# the software bundle becomes available for the system and allows -# one to add an IMM object representing the software bundle to the -# information model of the software catalog. -# -# If any of these operations fails, the bundle may not be added -# either to the repository or to the information model. - -# Now forget all of the above. This script checks something else... - -# FROM THE SMF WP Chapter III.D; -# 1. Administrator creating a Software Bundle object in IMM -# 2. IMM informing SMF that a new Software Bundle object is being -# created -# 3. SMF imports the software bundle associated with the Software -# Bundle object into the Software Repository -# 4. SMF verifies that the software bundle copy in the repository -# is valid and can be used
[devel] [PATCH 0 of 1] Review Request for SMF #656
Summary: smfd: smfBundleCheckCmd called as part of prerequisites test Review request for Trac Ticket(s): 656 Peer Reviewer(s): bertil Pull request to: Affected branch(es): default Development branch: default Impacted area Impact y/n Docsn Build systemn RPM/packaging n Configuration files n Startup scripts n SAF servicesn OpenSAF servicesy Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): - smfd: smfBundleCheckCmd called as part of prerequisites test The configured smfBundleCheckCmd is called as a part of the prerequisites test. The OpenSAF default implementation smf-bundle-check is changed. The command shall accept a bundle DN as parameter. The 00-README.conf is updated wit description of the command interface. changeset faab643b6f1b79a4a1796b99eb8d02427330bbf2 Author: Ingvar Bergstrom Date: Fri, 13 Dec 2013 13:51:08 +0100 smfd: smfBundleCheckCmd called as part of prerequisites test [656] Includes the invocation of the configured smfBundleCheckCmd command as a part of the prerequisites tests. The specified command is given the DN of the SaSmfSwBundle instance to check as argument. Complete diffstat: -- 00-README.conf | 12 ++ osaf/services/saf/smfsv/scripts/smf-bundle-check | 139 +++-- osaf/services/saf/smfsv/smfd/SmfCampState.cc | 90 +-- 3 files changed, 88 insertions(+), 153 deletions(-) Testing Commands: - Testing, Expected Results: -- Conditions of Submission: - Arch Built StartedLinux distro --- mipsn n mips64 n n x86 n n x86_64 y y 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 ~/.hgrc file (i.e. username, 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. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET
[devel] [PATCH 1 of 1] base: skip syslog in logtrace when nospc [#658]
osaf/libs/core/common/logtrace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/osaf/libs/core/common/logtrace.c b/osaf/libs/core/common/logtrace.c
--- a/osaf/libs/core/common/logtrace.c
+++ b/osaf/libs/core/common/logtrace.c
@@ -120,7 +120,7 @@ write_retry:
if (i == -1) {
if (errno == EAGAIN)
goto write_retry;
- else
+ else if (errno != ENOSPC)
syslog(LOG_ERR, "logtrace: write failed, %s",
strerror(errno));
}
}
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
[devel] [PATCH 0 of 1] Review Request for base #658
Summary: <> Review request for Trac Ticket(s): 658 Peer Reviewer(s): Anders Widell Pull request to: <> Affected branch(es): <> Development branch: <> Impacted area Impact y/n Docsn Build systemn RPM/packaging n Configuration files n Startup scripts n SAF servicesn OpenSAF servicesn Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): - changeset 84ba6d70dddae82cc28c1024f1b9b5243b3ea860 Author: Hans Feldt Date: Fri, 13 Dec 2013 13:46:28 +0100 base: skip syslog in logtrace when nospc [#658] Complete diffstat: -- osaf/libs/core/common/logtrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Testing Commands: - <> Testing, Expected Results: -- <> Conditions of Submission: - Ack from Anders 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 ~/.hgrc file (i.e. username, 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. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk ___ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
Re: [devel] [PATCH 1 of 1] build: Add extra GCC hardening compilation flags [#650]
Ack. I was going through this link to review this patch. http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html It might be of interest to you too. Basically, I wanted to figure out whether CPP_FLAGS should be passed to AM_CPP FLAGS or to AM_CXX FLAGS. - Mathi. > -Original Message- > From: Anders Widell [mailto:anders.wid...@ericsson.com] > Sent: Monday, December 09, 2013 5:15 PM > To: Mathivanan Naickan Palanivelu > Cc: opensaf-devel@lists.sourceforge.net > Subject: [PATCH 1 of 1] build: Add extra GCC hardening compilation flags > [#650] > > 00-README.conf | 2 +- > Makefile.common | 4 ++-- > README | 16 > configure.ac | 18 ++ > tools/cluster_sim_uml/README | 2 +- > 5 files changed, 34 insertions(+), 8 deletions(-) > > > By default, build with the extra hardening flags "-D_FORTIFY_SOURCE=2 > -fstack-protector" for improved security and enhanced run-time error > detection. The flags can be overridden by setting the environment variable > OSAF_HARDEN_FLAGS when building OpenSAF. > > Note that -D_FORTIFY_SOURCE=2 is only enabled in optimized builds. To > reduce the > risk that a user accidentally builds without optimization by overriding the > default CFLAGS and/or CXXFLAGS, the README files have been updated to > recommend > passing preprocessor definitions using CPPFLAGS instead of CFLAGS. > > diff --git a/00-README.conf b/00-README.conf > --- a/00-README.conf > +++ b/00-README.conf > @@ -85,7 +85,7 @@ file does not have to be changed unless: > - OpenSAF should run as a different UNIX group and user than the default > 'opensaf' >group/user. > > - If OpenSAF was built with the flags "CFLAGS=-DRUNASROOT", then > + If OpenSAF was built with the flags "CPPFLAGS=-DRUNASROOT", > then > change OPENSAF_GROUP and OPENSAF_USER to root i.e. for old > (<4.2) behaviour. > > For any other user, change OPENSAF_GROUP and OPENSAF_USER > accordingly > diff --git a/Makefile.common b/Makefile.common > --- a/Makefile.common > +++ b/Makefile.common > @@ -12,8 +12,8 @@ AM_CPPFLAGS = \ > $(CORE_INCLUDES) \ > $(all_includes) > > -AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC > -AM_CXXFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC - > D__STDC_FORMAT_MACROS > +AM_CFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC > @OSAF_HARDEN_FLAGS@ > +AM_CXXFLAGS = -Wall -fno-strict-aliasing -Werror -fPIC - > D__STDC_FORMAT_MACROS @OSAF_HARDEN_FLAGS@ > AM_LDFLAGS = -ldl -lrt -lpthread > > # > diff --git a/README b/README > --- a/README > +++ b/README > @@ -293,7 +293,7 @@ 1.1.1, 1.1.2 etc. > To re-enable the old (pre 4.3) non flat addressing, configure the constant > MDS_USE_SUBSLOT_ID=1 at configure time as in: > > -% ./configure CFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." > +% ./configure CPPFLAGS="-DMDS_USE_SUBSLOT_ID=1 ..." > > In the non flat scheme, the slot ID is shifted up 4 bits and subslot ID is > added in the 4 LSB. The consequence of this is reduced number of > @@ -308,7 +308,7 @@ 2) Run as root (optional) > If the old (<4.2) behaviour of running all processes as root is desired, use > the following configure command: > > -% ./configure CFLAGS=-DRUNASROOT > +% ./configure CPPFLAGS=-DRUNASROOT > > > 3) Configure TIPC importance (optional) > @@ -317,13 +317,21 @@ The default TIPC importance is LOW for a > In some cases the default importance must be changed if e.g. an application > starves the LOW importance communication level. > To change the default importance, use the following configure command > > - % ./configure CFLAGS=-DTIPCIMPORTANCE=level > + % ./configure CPPFLAGS=-DTIPCIMPORTANCE=level > where level is any of TIPC_LOW_IMPORTANCE, > TIPC_MEDIUM_IMPORTANCE or TIPC_HIGH_IMPORTANCE > - e.g. configure CFLAGS=-DTIPCIMPORTANCE=TIPC_HIGH_IMPORTANCE > + e.g. configure CPPFLAGS=-DTIPCIMPORTANCE=TIPC_HIGH_IMPORTANCE > > Note: Giving same importance to AVND & all other Opensaf models is not > preferred option. The behavior is unsupported. > > > +4) Configure GCC hardening options (optional) > + > +By default, the options "-fstack-protector -D_FORTIFY_SOURCE=2" are > passed to > +GCC for improved security. You can override these options by setting the > +OSAF_HARDEN_FLAGS when configuring OpenSAF. For example: > + > + % ./configure OSAF_HARDEN_FLAGS="-fstack-protector-all - > D_FORTIFY_SOURCE=2" > + > If you are using a released archive (dist tarball) follow the simple common > steps: > > diff --git a/configure.ac b/configure.ac > --- a/configure.ac > +++ b/configure.ac > @@ -545,6 +545,22 @@ if test "$enable_imm_pbe" = yes; then > PKG_CHECK_MODULES([SQLITE3], [sqlite3]) > fi > > +if test -z "$OSAF_HARDEN_FLAGS"; then > + # _FORTIFY_SOURCE requires optimization, so only enable it in > optimized > + # builds, i.e. when -O is present in both CFLAGS and CXXFLAGS. > + if echo
Re: [devel] [PATCH 0 of 1] Review Request for build: Add extra GCC hardening compilation flags [#650]
Hi, Can we have this pushed asap? It will only add to hardening of opensaf. Thanks, Hans On 12/09/2013 12:44 PM, Anders Widell wrote: > Summary: build: Add extra GCC hardening compilation flags [#650] > Review request for Trac Ticket(s): 650 > Peer Reviewer(s): Mathi -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk ___ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
Re: [devel] [PATCH 1 of 4] clm: add to the information model and update config, scripts [#220]
The IMMSV_NUM_NODES and IMMSV_MAX_WAIT are just heuristic parameters with the
goal of having
a significant subset of the intended cluster participate in loading. Nodes that
dont come up
In time to participate in loading have to be synced after loading, which can
increase the
Time it takes for the cluster to become functional.
Ideally these parameters should be adjusted per deployment.
In practice I dont think anyone touches them.
In any case, the default settings at least prevents the first SC that comes up
from
Immediately running away and starting loading.
/AndersBj
-Original Message-
From: Mathivanan Naickan Palanivelu [mailto:mathi.naic...@oracle.com]
Sent: den 13 december 2013 10:20
To: Hans Feldt; Ramesh Babu Betham
Cc: opensaf-devel@lists.sourceforge.net
Subject: Re: [devel] [PATCH 1 of 4] clm: add to the information model and
update config, scripts [#220]
>
> And I forgot, please move clmna or whatever it will be called before
> immnd
Yeah, we could have a renaming ceremony in 4.5, but Today I just left it to be
termed as clmna(with recovery as node failfast), because handle management is
still with CLMServer.
Sure, I should change the binary name from noded to clmna.
> in nodeinit.payload so that immnd does not get synced on a non member
> node.
Yes, ideally that is how it should be on payloads, but you know it was that way
until IMM had introduced its own clusterstartup logic Via "IMMSV_NUM_NODES" &&
"IMMSV_MAX_WAIT"
-Mathi.
> /Hans
>
> On 12/13/2013 08:59 AM, Hans Feldt wrote:
> >
> >
> > On 12/04/2013 02:00 PM, mathi.naic...@oracle.com wrote:
> >>opensaf.spec.in | 1 +
> >>osaf/services/saf/clmsv/config/Makefile.am | 3 +-
> >>osaf/services/saf/clmsv/config/clmna.conf| 14 ++
> >>osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
>
> >>osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
> >>osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
> >>osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
> >>7 files changed, 157 insertions(+), 1 deletions(-)
> >>
> >>
> >> diff --git a/opensaf.spec.in b/opensaf.spec.in
> >> --- a/opensaf.spec.in
> >> +++ b/opensaf.spec.in
> >> @@ -1014,6 +1014,7 @@ fi
> >>%defattr(-,root,root)
> >>%dir %{_pkgclcclidir}
> >>%dir %{_pkglibdir}
> >> +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
> >>%{_pkglibdir}/osafclmna
> >>%{_pkgclcclidir}/osaf-noded
> >>
> >> diff --git a/osaf/services/saf/clmsv/config/Makefile.am
> >> b/osaf/services/saf/clmsv/config/Makefile.am
> >> --- a/osaf/services/saf/clmsv/config/Makefile.am
> >> +++ b/osaf/services/saf/clmsv/config/Makefile.am
> >> @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
> >>MAINTAINERCLEANFILES = Makefile.in
> >>
> >>dist_pkgsysconf_DATA = \
> >> - $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
> >> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
> >> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
> >>
> >>if ENABLE_IMMXML
> >>
> >> diff --git a/osaf/services/saf/clmsv/config/clmna.conf
> >> b/osaf/services/saf/clmsv/config/clmna.conf
> >> new file mode 100644
> >> --- /dev/null
> >> +++ b/osaf/services/saf/clmsv/config/clmna.conf
> >> @@ -0,0 +1,14 @@
> >> +# This file contains configuration for the SAF CLM service # See
> >> +the file services/clmsv/README for more configuration options.
> >> +
> >> +# Uncomment the next line if you want to run the CLM server
> >> +through valgrind #export TOOL="valgrind --leak-check=full --log-
> file=/tmp/log.valgrind"
> >> +
> >> +# Uncomment the next line to enable trace
> >> +#args="--tracemask=0x"
> >> +
> >> +# Healthcheck keys
> >> +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
> >> +
> >> +# Uncomment the next line to enable info level logging
> >> +#args="--loglevel=info"
> >> diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> @@ -106,4 +106,89 @@
> >>1
> >>
> >>
> >> +
> >> +
> >> + safCompType=OpenSafCompTypeCLMNA
> >
> > CLMND?
> >
> >> +
> >> +
> >> +
> safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA n>
> >
> > saVersion=1 would be better
> >
> > adding 4.0.0 was a mistake I did
> >
> >> +
> >> + saAmfCtSwBundle
> >> + safSmfBundle=OpenSAF
> >> +
> >> +
> >> + saAmfCtCompCategory
> >> + 1
> >> +
> >> +
> >> + saAmfCtDefClcCliTimeout
> >> + 100
> >> +
> >> +
> >> + saAmfCtDefCallbackTimeout
> >> +
Re: [devel] [PATCH 1 of 4] clm: add to the information model and update config, scripts [#220]
>
> And I forgot, please move clmna or whatever it will be called before immnd
Yeah, we could have a renaming ceremony in 4.5, but Today I just left it to be
termed as clmna(with recovery as node failfast),
because handle management is still with CLMServer.
Sure, I should change the binary name from noded to clmna.
> in nodeinit.payload so that immnd does not get synced on a non member
> node.
Yes, ideally that is how it should be on payloads, but you know it was that way
until IMM
had introduced its own clusterstartup logic Via "IMMSV_NUM_NODES" &&
"IMMSV_MAX_WAIT"
-Mathi.
> /Hans
>
> On 12/13/2013 08:59 AM, Hans Feldt wrote:
> >
> >
> > On 12/04/2013 02:00 PM, mathi.naic...@oracle.com wrote:
> >>opensaf.spec.in | 1 +
> >>osaf/services/saf/clmsv/config/Makefile.am | 3 +-
> >>osaf/services/saf/clmsv/config/clmna.conf| 14 ++
> >>osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
>
> >>osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
> >>osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
> >>osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
> >>7 files changed, 157 insertions(+), 1 deletions(-)
> >>
> >>
> >> diff --git a/opensaf.spec.in b/opensaf.spec.in
> >> --- a/opensaf.spec.in
> >> +++ b/opensaf.spec.in
> >> @@ -1014,6 +1014,7 @@ fi
> >>%defattr(-,root,root)
> >>%dir %{_pkgclcclidir}
> >>%dir %{_pkglibdir}
> >> +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
> >>%{_pkglibdir}/osafclmna
> >>%{_pkgclcclidir}/osaf-noded
> >>
> >> diff --git a/osaf/services/saf/clmsv/config/Makefile.am
> >> b/osaf/services/saf/clmsv/config/Makefile.am
> >> --- a/osaf/services/saf/clmsv/config/Makefile.am
> >> +++ b/osaf/services/saf/clmsv/config/Makefile.am
> >> @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
> >>MAINTAINERCLEANFILES = Makefile.in
> >>
> >>dist_pkgsysconf_DATA = \
> >> - $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
> >> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
> >> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
> >>
> >>if ENABLE_IMMXML
> >>
> >> diff --git a/osaf/services/saf/clmsv/config/clmna.conf
> >> b/osaf/services/saf/clmsv/config/clmna.conf
> >> new file mode 100644
> >> --- /dev/null
> >> +++ b/osaf/services/saf/clmsv/config/clmna.conf
> >> @@ -0,0 +1,14 @@
> >> +# This file contains configuration for the SAF CLM service # See the
> >> +file services/clmsv/README for more configuration options.
> >> +
> >> +# Uncomment the next line if you want to run the CLM server through
> >> +valgrind #export TOOL="valgrind --leak-check=full --log-
> file=/tmp/log.valgrind"
> >> +
> >> +# Uncomment the next line to enable trace
> >> +#args="--tracemask=0x"
> >> +
> >> +# Healthcheck keys
> >> +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
> >> +
> >> +# Uncomment the next line to enable info level logging
> >> +#args="--loglevel=info"
> >> diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> >> @@ -106,4 +106,89 @@
> >>1
> >>
> >>
> >> +
> >> +
> >> + safCompType=OpenSafCompTypeCLMNA
> >
> > CLMND?
> >
> >> +
> >> +
> >> +
> safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA n>
> >
> > saVersion=1 would be better
> >
> > adding 4.0.0 was a mistake I did
> >
> >> +
> >> + saAmfCtSwBundle
> >> + safSmfBundle=OpenSAF
> >> +
> >> +
> >> + saAmfCtCompCategory
> >> + 1
> >> +
> >> +
> >> + saAmfCtDefClcCliTimeout
> >> + 100
> >> +
> >> +
> >> + saAmfCtDefCallbackTimeout
> >> + 100
> >> +
> >> +
> >> + saAmfCtRelPathInstantiateCmd
> >> + osaf-noded
> >
> > and then noded?
> >
> >> +
> >> +
> >> + saAmfCtDefInstantiateCmdArgv
> >> + instantiate
> >> +
> >> +
> >> +saAmfCtDefInstantiationLevel
> >> +2
> >> +
> >> +
> >> + saAmfCtRelPathCleanupCmd
> >> + osaf-clmd
> >> +
> >> +
> >> + saAmfCtDefCleanupCmdArgv
> >> + stop
> >> +
> >> +
> >> +
> saAmfCtDefQuiescingCompleteTimeout
> >> + 100
> >> +
> >> +
> >> + saAmfCtDefRecoveryOnError
> >> + 6
> >> +
> >> +
Re: [devel] [PATCH 1 of 4] clm: add to the information model and update config, scripts [#220]
And I forgot, please move clmna or whatever it will be called before immnd in
nodeinit.payload so that immnd does not
get synced on a non member node.
/Hans
On 12/13/2013 08:59 AM, Hans Feldt wrote:
>
>
> On 12/04/2013 02:00 PM, mathi.naic...@oracle.com wrote:
>>opensaf.spec.in | 1 +
>>osaf/services/saf/clmsv/config/Makefile.am | 3 +-
>>osaf/services/saf/clmsv/config/clmna.conf| 14 ++
>>osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
>>
>>osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
>>osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
>>osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
>>7 files changed, 157 insertions(+), 1 deletions(-)
>>
>>
>> diff --git a/opensaf.spec.in b/opensaf.spec.in
>> --- a/opensaf.spec.in
>> +++ b/opensaf.spec.in
>> @@ -1014,6 +1014,7 @@ fi
>>%defattr(-,root,root)
>>%dir %{_pkgclcclidir}
>>%dir %{_pkglibdir}
>> +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
>>%{_pkglibdir}/osafclmna
>>%{_pkgclcclidir}/osaf-noded
>>
>> diff --git a/osaf/services/saf/clmsv/config/Makefile.am
>> b/osaf/services/saf/clmsv/config/Makefile.am
>> --- a/osaf/services/saf/clmsv/config/Makefile.am
>> +++ b/osaf/services/saf/clmsv/config/Makefile.am
>> @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
>>MAINTAINERCLEANFILES = Makefile.in
>>
>>dist_pkgsysconf_DATA = \
>> -$(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
>> +$(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
>> +$(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
>>
>>if ENABLE_IMMXML
>>
>> diff --git a/osaf/services/saf/clmsv/config/clmna.conf
>> b/osaf/services/saf/clmsv/config/clmna.conf
>> new file mode 100644
>> --- /dev/null
>> +++ b/osaf/services/saf/clmsv/config/clmna.conf
>> @@ -0,0 +1,14 @@
>> +# This file contains configuration for the SAF CLM service
>> +# See the file services/clmsv/README for more configuration options.
>> +
>> +# Uncomment the next line if you want to run the CLM server through valgrind
>> +#export TOOL="valgrind --leak-check=full --log-file=/tmp/log.valgrind"
>> +
>> +# Uncomment the next line to enable trace
>> +#args="--tracemask=0x"
>> +
>> +# Healthcheck keys
>> +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
>> +
>> +# Uncomment the next line to enable info level logging
>> +#args="--loglevel=info"
>> diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
>> b/osaf/services/saf/clmsv/config/clmsv_objects.xml
>> --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
>> +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
>> @@ -106,4 +106,89 @@
>> 1
>>
>>
>> +
>> +
>> +safCompType=OpenSafCompTypeCLMNA
>
> CLMND?
>
>> +
>> +
>> +safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA
>
> saVersion=1 would be better
>
> adding 4.0.0 was a mistake I did
>
>> +
>> +saAmfCtSwBundle
>> +safSmfBundle=OpenSAF
>> +
>> +
>> +saAmfCtCompCategory
>> +1
>> +
>> +
>> +saAmfCtDefClcCliTimeout
>> +100
>> +
>> +
>> +saAmfCtDefCallbackTimeout
>> +100
>> +
>> +
>> +saAmfCtRelPathInstantiateCmd
>> +osaf-noded
>
> and then noded?
>
>> +
>> +
>> +saAmfCtDefInstantiateCmdArgv
>> +instantiate
>> +
>> +
>> +saAmfCtDefInstantiationLevel
>> +2
>> +
>> +
>> +saAmfCtRelPathCleanupCmd
>> +osaf-clmd
>> +
>> +
>> +saAmfCtDefCleanupCmdArgv
>> +stop
>> +
>> +
>> +saAmfCtDefQuiescingCompleteTimeout
>> +100
>> +
>> +
>> +saAmfCtDefRecoveryOnError
>> +6
>> +
>> +
>> +saAmfCtDefDisableRestart
>> +1
>> +
>> +
>> +
>> +
>> safHealthcheckKey=Default,safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA
>> +
>> +saAmfHctDefPeriod
>> +2400
>> +
>> +
>> +saAmfHctDefMaxDuration
>> +1800
>> +
>> +
>> +
>> +safCSType=CLMNA-OpenSAF
>> +
>> +
>> +safVersion=4.0.0,safCSType=CLMNA-OpenSAF
>> +
>> +
>> +
Re: [devel] [PATCH 1 of 4] clm: add to the information model and update config, scripts [#220]
On 12/04/2013 02:00 PM, mathi.naic...@oracle.com wrote:
> opensaf.spec.in | 1 +
> osaf/services/saf/clmsv/config/Makefile.am | 3 +-
> osaf/services/saf/clmsv/config/clmna.conf| 14 ++
> osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
>
> osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
> osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
> osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
> 7 files changed, 157 insertions(+), 1 deletions(-)
>
>
> diff --git a/opensaf.spec.in b/opensaf.spec.in
> --- a/opensaf.spec.in
> +++ b/opensaf.spec.in
> @@ -1014,6 +1014,7 @@ fi
> %defattr(-,root,root)
> %dir %{_pkgclcclidir}
> %dir %{_pkglibdir}
> +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
> %{_pkglibdir}/osafclmna
> %{_pkgclcclidir}/osaf-noded
>
> diff --git a/osaf/services/saf/clmsv/config/Makefile.am
> b/osaf/services/saf/clmsv/config/Makefile.am
> --- a/osaf/services/saf/clmsv/config/Makefile.am
> +++ b/osaf/services/saf/clmsv/config/Makefile.am
> @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
> MAINTAINERCLEANFILES = Makefile.in
>
> dist_pkgsysconf_DATA = \
> - $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
>
> if ENABLE_IMMXML
>
> diff --git a/osaf/services/saf/clmsv/config/clmna.conf
> b/osaf/services/saf/clmsv/config/clmna.conf
> new file mode 100644
> --- /dev/null
> +++ b/osaf/services/saf/clmsv/config/clmna.conf
> @@ -0,0 +1,14 @@
> +# This file contains configuration for the SAF CLM service
> +# See the file services/clmsv/README for more configuration options.
> +
> +# Uncomment the next line if you want to run the CLM server through valgrind
> +#export TOOL="valgrind --leak-check=full --log-file=/tmp/log.valgrind"
> +
> +# Uncomment the next line to enable trace
> +#args="--tracemask=0x"
> +
> +# Healthcheck keys
> +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
> +
> +# Uncomment the next line to enable info level logging
> +#args="--loglevel=info"
> diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> @@ -106,4 +106,89 @@
> 1
>
>
> +
> +
> + safCompType=OpenSafCompTypeCLMNA
CLMND?
> +
> +
> + safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA
saVersion=1 would be better
adding 4.0.0 was a mistake I did
> +
> + saAmfCtSwBundle
> + safSmfBundle=OpenSAF
> +
> +
> + saAmfCtCompCategory
> + 1
> +
> +
> + saAmfCtDefClcCliTimeout
> + 100
> +
> +
> + saAmfCtDefCallbackTimeout
> + 100
> +
> +
> + saAmfCtRelPathInstantiateCmd
> + osaf-noded
and then noded?
> +
> +
> + saAmfCtDefInstantiateCmdArgv
> + instantiate
> +
> +
> +saAmfCtDefInstantiationLevel
> +2
> +
> +
> + saAmfCtRelPathCleanupCmd
> + osaf-clmd
> +
> +
> + saAmfCtDefCleanupCmdArgv
> + stop
> +
> +
> + saAmfCtDefQuiescingCompleteTimeout
> + 100
> +
> +
> + saAmfCtDefRecoveryOnError
> + 6
> +
> +
> + saAmfCtDefDisableRestart
> + 1
> +
> +
> +
> +
> safHealthcheckKey=Default,safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA
> +
> + saAmfHctDefPeriod
> + 2400
> +
> +
> + saAmfHctDefMaxDuration
> + 1800
> +
> +
> +
> + safCSType=CLMNA-OpenSAF
> +
> +
> + safVersion=4.0.0,safCSType=CLMNA-OpenSAF
> +
> +
> +
> safMemberCompType=safVersion=4.0.0\,safCompType=OpenSafCompTypeCLMNA,safVersion=4.0.0,safSuType=OpenSafSuTypeND
> +
> +
> +
> safMemberCSType=safVersion=4.0.0\,safCSType=CLMNA-OpenSAF,safVersion=4.0.0,safSvcType=NoRed-OpenSAF
> +
> +
> +
> safSupporte
