clmprint should exit with EXIT_FAILURE when querying non-member node.
---
src/clm/tools/clm_print.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/clm/tools/clm_print.c b/src/clm/tools/clm_print.c
index f44aee2..25b5e35 100644
--- a/src/clm/tools/clm_print.c
+++ b/src/clm/tools/clm_print.c
@@ -454,12 +454,12 @@ int main(int argc, char *argv[])
rc = saClmClusterNodeGet_4(clm_handle, node_id,
((timeout == -1) ? (TIME_OUT) : timeout),
&clusterNode);
if (rc == SA_AIS_ERR_NOT_EXIST) {
- fprintf(stdout, "Node id 0x%x is not in cluster
membership\n", node_id);
- exit(EXIT_SUCCESS);
+ fprintf(stderr, "Node id 0x%x is not in cluster
membership!\n", node_id);
} else if (rc == SA_AIS_ERR_UNAVAILABLE) {
- fprintf(stdout, "error - invoking clmprint from
non-member node\n");
- exit(EXIT_FAILURE);
- } else if (rc != SA_AIS_OK) {
+ fprintf(stderr, "invoking clmprint from non-member
node!\n");
+ }
+
+ if (rc != SA_AIS_OK) {
fprintf(stderr, "error - clmprint::
saClmClusterNodeGet_4 failed, rc = %d\n", rc);
exit(EXIT_FAILURE);
}
@@ -470,12 +470,12 @@ int main(int argc, char *argv[])
case 'a':
rc = saClmClusterNodeGetAsync(clm_handle, INVOCATION_ID,
node_id);
if (rc == SA_AIS_ERR_NOT_EXIST) {
- fprintf(stdout, "Node id 0x%x is not in cluster
membership\n", node_id);
- exit(EXIT_SUCCESS);
+ fprintf(stderr, "Node id 0x%x is not in cluster
membership!\n", node_id);
} else if (rc == SA_AIS_ERR_UNAVAILABLE) {
- fprintf(stdout, "error - invoking clmprint from
non-member node\n");
- exit(EXIT_FAILURE);
- } else if (rc != SA_AIS_OK) {
+ fprintf(stdout, "invoking clmprint from non-member
node!\n");
+ }
+
+ if (rc != SA_AIS_OK) {
fprintf(stderr, "error - clmprint ::
saClmClusterNodeGetAsync failed, rc = %d\n", rc);
exit(EXIT_FAILURE);
}
@@ -487,9 +487,10 @@ int main(int argc, char *argv[])
clusterNotificationBuffer.numberOfItems = SIZE_NOTIFICATIONS;
rc = saClmClusterTrack_4(clm_handle, SA_TRACK_CURRENT,
&clusterNotificationBuffer);
if (rc == SA_AIS_ERR_UNAVAILABLE) {
- fprintf(stdout, "error - invoking clmprint from
non-member node\n");
- exit(EXIT_FAILURE);
- } else if (rc != SA_AIS_OK) {
+ fprintf(stderr, "invoking clmprint from non-member
node!\n");
+ }
+
+ if (rc != SA_AIS_OK) {
fprintf(stderr, "error - clmprint:: saClmClusterTrack_4
failed, rc = %d\n", rc);
exit(EXIT_FAILURE);
}
@@ -505,9 +506,10 @@ int main(int argc, char *argv[])
case 'm':
rc = saClmClusterTrack_4(clm_handle, trackFlags, NULL);
if (rc == SA_AIS_ERR_UNAVAILABLE) {
- fprintf(stdout, "error - invoking clmprint from
non-member node\n");
- exit(EXIT_FAILURE);
- } else if (rc != SA_AIS_OK) {
+ fprintf(stderr, "invoking clmprint from non-member
node!\n");
+ }
+
+ if (rc != SA_AIS_OK) {
fprintf(stderr, "error - clmprint:: saClmClusterTrack_4
failed, rc = %d\n", rc);
exit(EXIT_FAILURE);
}
--
1.9.1
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
