|
 |
8d2604 |
From 57424bd1f158f1ff597034e09ca90da864925a16 Mon Sep 17 00:00:00 2001
|
|
|
8d2604 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
8d2604 |
Date: Thu, 16 Jul 2020 09:58:55 +0200
|
|
|
8d2604 |
Subject: [PATCH] azure-events: only decode() when exec() output not of type
|
|
|
8d2604 |
str
|
|
|
8d2604 |
|
|
|
8d2604 |
---
|
|
|
8d2604 |
heartbeat/azure-events.in | 10 ++++++----
|
|
|
8d2604 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
8d2604 |
|
|
|
8d2604 |
diff --git a/heartbeat/azure-events.in b/heartbeat/azure-events.in
|
|
|
8d2604 |
index a48a86309..d4a166d9f 100644
|
|
|
8d2604 |
--- a/heartbeat/azure-events.in
|
|
|
8d2604 |
+++ b/heartbeat/azure-events.in
|
|
|
8d2604 |
@@ -179,6 +179,8 @@ class clusterHelper:
|
|
|
8d2604 |
ocf.logger.debug("_exec: cmd = %s" % " ".join(command))
|
|
|
8d2604 |
try:
|
|
|
8d2604 |
ret = subprocess.check_output(command)
|
|
|
8d2604 |
+ if type(ret) != str:
|
|
|
8d2604 |
+ ret = ret.decode()
|
|
|
8d2604 |
ocf.logger.debug("_exec: return = %s" % ret)
|
|
|
8d2604 |
return ret.rstrip()
|
|
|
8d2604 |
except Exception as err:
|
|
|
8d2604 |
@@ -232,7 +234,7 @@ class clusterHelper:
|
|
|
8d2604 |
|
|
|
8d2604 |
nodes = []
|
|
|
8d2604 |
nodeList = clusterHelper._exec("crm_node", "--list")
|
|
|
8d2604 |
- for n in nodeList.decode().split("\n"):
|
|
|
8d2604 |
+ for n in nodeList.split("\n"):
|
|
|
8d2604 |
nodes.append(n.split()[1])
|
|
|
8d2604 |
ocf.logger.debug("getAllNodes: finished; return %s" % str(nodes))
|
|
|
8d2604 |
|
|
|
8d2604 |
@@ -303,7 +305,7 @@ class clusterHelper:
|
|
|
8d2604 |
ocf.logger.warning("transitionSummary: received unexpected transition summary: %s" % summary)
|
|
|
8d2604 |
return False
|
|
|
8d2604 |
summary = summary.split("Transition Summary:")[1]
|
|
|
8d2604 |
- ret = summary.decode().split("\n").pop(0)
|
|
|
8d2604 |
+ ret = summary.split("\n").pop(0)
|
|
|
8d2604 |
|
|
|
8d2604 |
ocf.logger.debug("transitionSummary: finished; return = %s" % str(ret))
|
|
|
8d2604 |
return ret
|
|
|
8d2604 |
@@ -324,7 +326,7 @@ class clusterHelper:
|
|
|
8d2604 |
if len(resources) == 0:
|
|
|
8d2604 |
ret = []
|
|
|
8d2604 |
else:
|
|
|
8d2604 |
- ret = resources.decode().split("\n")
|
|
|
8d2604 |
+ ret = resources.split("\n")
|
|
|
8d2604 |
|
|
|
8d2604 |
ocf.logger.debug("listOperationsOnNode: finished; return = %s" % str(ret))
|
|
|
8d2604 |
return ret
|
|
|
8d2604 |
@@ -470,7 +472,7 @@ class Node:
|
|
|
8d2604 |
|
|
|
8d2604 |
eventIDStr = clusterHelper.getAttr(attr_pendingEventIDs, node=node)
|
|
|
8d2604 |
if eventIDStr:
|
|
|
8d2604 |
- eventIDs = eventIDStr.decode().split(",")
|
|
|
8d2604 |
+ eventIDs = eventIDStr.split(",")
|
|
|
8d2604 |
else:
|
|
|
8d2604 |
eventIDs = None
|
|
|
8d2604 |
|