See inline
Thanks,
Hans
On 03/27/2014 02:13 AM, [email protected] wrote:
> osaf/services/saf/clmsv/clms/clms_evt.c | 12 ++++++++++--
> osaf/services/saf/clmsv/nodeagent/main.c | 7 +++----
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
>
> When a node join request from an unconfigured/misconfigured node is
> attempted, then
> CLM prints the following log message:
> Mar 26 18:44:52 SC-1 local0.err osafclmd[418]: ER CLM NodeName: 'SC-3'
> doesn't match entry in imm.xml.
> Specify a correct node name in/etc/opensaf/node_name.
> This log message is currently categorized as ERROR. However, there are
> suggestions to improve
> the current log message such that the message more closely depicts
> the case of unconfigured or misconfigured nodes.
> The log string is now changed as below:
> Mar 26 20:23:32 SC-1 local0.notice osafclmd[420]: NO CLM NodeName: 'PL-8' is
> not a configured cluster node.
> Mar 26 20:23:32 SC-1 local0.notice osafclmd[420]: NO /etc/opensaf/node_name
> should contain the rdn value of a configured CLM node object name
>
> In the case of problems with connectivity problems, the following modified
> log strings are added:
> Send timed out. Check status(network, process) of ACTIVE controller
> and
> Send failed: %u. Check network connectivity
>
> diff --git a/osaf/services/saf/clmsv/clms/clms_evt.c
> b/osaf/services/saf/clmsv/clms/clms_evt.c
> --- a/osaf/services/saf/clmsv/clms/clms_evt.c
> +++ b/osaf/services/saf/clmsv/clms/clms_evt.c
> @@ -282,8 +282,16 @@ uint32_t proc_node_up_msg(CLMS_CB * cb,
> node = clms_node_get_by_name(&node_name);
> if (node == NULL) {
> clm_msg.info.api_resp_info.rc = SA_AIS_ERR_NOT_EXIST;
> - LOG_ER("CLM NodeName: '%s' doesn't match entry in imm.xml.
> Specify a correct node name in" PKGSYSCONFDIR "/node_name",
> - nodeup_info->node_name.value);
> + /* The /etc/opensaf/node_name is an user exposed configuration
> file.
> + * The node_name file contains the RDN value of the CLM node
> name.
> + * (a) When opensaf cluster configuration is pre-provisioned
> using the OpenSAF IMM tools:
> + * the /etc/opensaf/node_name should contain one of the
> values specified
> + * in nodes.cfg while generating the imm.xml.
> + * (b) When opensaf cluster nodes are dynamically added at
> runtime:
> + * the /etc/opensaf/node_name should contain the rdn value.
> + */
> + LOG_NO("CLM NodeName: '%s' is not a configured cluster node.",
> nodeup_info->node_name.value);
In this log I would like to see the "join the cluster" and "unconfigured" that
I tried to read out from the CLM spec
3.1.2. For example:
"Node '%s' [attempts|requests] to join the cluster but is unconfigured"
> + LOG_NO(PKGSYSCONFDIR "/node_name should contain the rdn value
> of configured CLM node object name");
This log is not relevant/correct and should be removed. CLM cannot know if the
name presented is wrong or just about to
be configured.
> }
>
> if (node != NULL) {
> diff --git a/osaf/services/saf/clmsv/nodeagent/main.c
> b/osaf/services/saf/clmsv/nodeagent/main.c
> --- a/osaf/services/saf/clmsv/nodeagent/main.c
> +++ b/osaf/services/saf/clmsv/nodeagent/main.c
> @@ -442,11 +442,10 @@ SaAisErrorT clmna_process_dummyup_msg(vo
> break;
> case NCSCC_RC_REQ_TIMOUT:
> error = SA_AIS_ERR_TIMEOUT;
> - break;
> - LOG_ER("clmna_mds_msg_sync_send Timed Out");
> + LOG_ER("Send timed out. Check status(network, process)
> of ACTIVE controller");
> goto done;
> default:
> - LOG_ER("clmna_mds_msg_sync_send FAILED: %u", rc);
> + LOG_ER("Send failed: %u. Check network connectivity",
> rc);
> goto done;
> }
>
> @@ -456,7 +455,7 @@ SaAisErrorT clmna_process_dummyup_msg(vo
> error = SA_AIS_ERR_NO_RESOURCES;
>
> if (error == SA_AIS_ERR_NOT_EXIST) {
> - LOG_ER("%s is Not a member of cluster",
> + LOG_ER("%s is not a configured node",
>
> o_msg->info.api_resp_info.param.node_name.value);
> free(o_msg);
> goto done;
>
>
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
