diff options
| author | Valerii Ponomarov <vponomar@redhat.com> | 2019-02-26 18:54:12 +0530 |
|---|---|---|
| committer | vponomar <vponomar@redhat.com> | 2019-02-28 09:12:14 +0000 |
| commit | 42e6aaaccdbd802565ca1b323fbac272f4a5c5e4 (patch) | |
| tree | 7d931f657260c146bebeb3c84b871b85a4e61026 | |
| parent | faa8352fa7c4354b04c350ff601ff9b052c50d35 (diff) | |
Fix error message in 'cmd_run_on_gluster_pod_or_node' function
In case of error on CRS node we get incorrect error message.
Instead of command error we get another kind of an error.
Change-Id: Ibfd21d518c220951a981f23daa5d32b1963061f2
| -rw-r--r-- | cns-libs/cnslibs/common/openshift_ops.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cns-libs/cnslibs/common/openshift_ops.py b/cns-libs/cnslibs/common/openshift_ops.py index dd5f8e17..2899d531 100644 --- a/cns-libs/cnslibs/common/openshift_ops.py +++ b/cns-libs/cnslibs/common/openshift_ops.py @@ -790,6 +790,7 @@ def cmd_run_on_gluster_pod_or_node(ocp_client_node, cmd, gluster_node=None): """ # Containerized Glusterfs gluster_pods = oc_get_pods(ocp_client_node, selector="glusterfs-node=pod") + err_msg = "" if gluster_pods: if gluster_node: for pod_name, pod_data in gluster_pods.items(): @@ -803,7 +804,6 @@ def cmd_run_on_gluster_pod_or_node(ocp_client_node, cmd, gluster_node=None): else: gluster_pod_names = gluster_pods.keys() - err_msg = "" for gluster_pod_name in gluster_pod_names: try: pod_cmd = "oc exec %s -- %s" % (gluster_pod_name, cmd) @@ -824,12 +824,15 @@ def cmd_run_on_gluster_pod_or_node(ocp_client_node, cmd, gluster_node=None): try: return command.cmd_run(cmd, hostname=g_host) except Exception as e: - g.log.error( - "Failed to run '%s' command on '%s' Gluster node. " - "Error: %s" % (cmd, g_host, e)) - - raise exceptions.ExecutionError( - "Haven't found neither Gluster PODs nor Gluster nodes.") + err = ("Failed to run '%s' command on '%s' Gluster node. " + "Error: %s\n" % (cmd, g_host, e)) + err_msg += err + g.log.error(err) + + if not err_msg: + raise exceptions.ExecutionError( + "Haven't found neither Gluster PODs nor Gluster nodes.") + raise exceptions.ExecutionError(err_msg) def get_gluster_vol_info_by_pvc_name(ocp_node, pvc_name): |