|
 |
b7d4d7 |
From 6ed227367b6eb7d6d7afde3859ad0a711a3adf36 Mon Sep 17 00:00:00 2001
|
|
|
b7d4d7 |
From: Leela Venkaiah G <gleelavenkaiah@gmail.com>
|
|
|
b7d4d7 |
Date: Wed, 13 Jan 2021 16:02:25 +0530
|
|
|
b7d4d7 |
Subject: [PATCH 519/526] glusterfs-events: Fix incorrect attribute access
|
|
|
b7d4d7 |
(#2002)
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
Issue: When GlusterCmdException is raised, current code try to access
|
|
|
b7d4d7 |
message atrribute which doesn't exist and resulting in a malformed
|
|
|
b7d4d7 |
error string on failure operations
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
Code Change: Replace `message` with `args[0]`
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
>Fixes: #2001
|
|
|
b7d4d7 |
>Change-Id: I65c9f0ee79310937a384025b8d454acda154e4bb
|
|
|
b7d4d7 |
>Signed-off-by: Leela Venkaiah G <lgangava@redhat.com>
|
|
|
b7d4d7 |
Upstream patch: https://github.com/gluster/glusterfs/pull/2002
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
BUG: 1600459
|
|
|
b7d4d7 |
Change-Id: I65c9f0ee79310937a384025b8d454acda154e4bb
|
|
|
b7d4d7 |
Signed-off-by: srijan-sivakumar <ssivakum@redhat.com>
|
|
|
b7d4d7 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/223584
|
|
|
b7d4d7 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
b7d4d7 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
b7d4d7 |
---
|
|
|
b7d4d7 |
events/src/peer_eventsapi.py | 8 ++++----
|
|
|
b7d4d7 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
diff --git a/events/src/peer_eventsapi.py b/events/src/peer_eventsapi.py
|
|
|
b7d4d7 |
index 26b77a0..c388da4 100644
|
|
|
b7d4d7 |
--- a/events/src/peer_eventsapi.py
|
|
|
b7d4d7 |
+++ b/events/src/peer_eventsapi.py
|
|
|
b7d4d7 |
@@ -174,9 +174,9 @@ def sync_to_peers(args):
|
|
|
b7d4d7 |
sync_file_to_peers(WEBHOOKS_FILE_TO_SYNC)
|
|
|
b7d4d7 |
except GlusterCmdException as e:
|
|
|
b7d4d7 |
# Print stdout if stderr is empty
|
|
|
b7d4d7 |
- errmsg = e.message[2] if e.message[2] else e.message[1]
|
|
|
b7d4d7 |
+ errmsg = e.args[0][2] if e.args[0][2] else e.args[0][1]
|
|
|
b7d4d7 |
handle_output_error("Failed to sync Webhooks file: [Error: {0}]"
|
|
|
b7d4d7 |
- "{1}".format(e.message[0], errmsg),
|
|
|
b7d4d7 |
+ "{1}".format(e.args[0][0], errmsg),
|
|
|
b7d4d7 |
errcode=ERROR_WEBHOOK_SYNC_FAILED,
|
|
|
b7d4d7 |
json_output=args.json)
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
@@ -185,9 +185,9 @@ def sync_to_peers(args):
|
|
|
b7d4d7 |
sync_file_to_peers(CUSTOM_CONFIG_FILE_TO_SYNC)
|
|
|
b7d4d7 |
except GlusterCmdException as e:
|
|
|
b7d4d7 |
# Print stdout if stderr is empty
|
|
|
b7d4d7 |
- errmsg = e.message[2] if e.message[2] else e.message[1]
|
|
|
b7d4d7 |
+ errmsg = e.args[0][2] if e.args[0][2] else e.args[0][1]
|
|
|
b7d4d7 |
handle_output_error("Failed to sync Config file: [Error: {0}]"
|
|
|
b7d4d7 |
- "{1}".format(e.message[0], errmsg),
|
|
|
b7d4d7 |
+ "{1}".format(e.args[0][0], errmsg),
|
|
|
b7d4d7 |
errcode=ERROR_CONFIG_SYNC_FAILED,
|
|
|
b7d4d7 |
json_output=args.json)
|
|
|
b7d4d7 |
|
|
|
b7d4d7 |
--
|
|
|
b7d4d7 |
1.8.3.1
|
|
|
b7d4d7 |
|