[PATCH blivet rhel7-branch] iscsi: improve logging of failed logins (#1114820)
Martin Kolman
mkolman at redhat.com
Tue Dec 2 12:31:12 UTC 2014
On Tue, 2014-12-02 at 09:52 +0100, Radek Vykydal wrote:
> Related: rhbz#1114820
> ---
> blivet/iscsi.py | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/blivet/iscsi.py b/blivet/iscsi.py
> index cc557cb..c8c4e5d 100644
> --- a/blivet/iscsi.py
> +++ b/blivet/iscsi.py
> @@ -161,8 +161,9 @@ class iscsi(object):
> node.name, node.address, node.port, node.iface)
> self.ibftNodes.append(node)
> except IOError as e:
> - log.error("Could not log into ibft iscsi target %s: %s",
> - node.name, str(e))
> + log.error("iSCSI: could not log into ibft %s at %s:%s through %s: %s",
> + node.name, node.address, node.port, node.iface,
> + str(e))
>
> self.stabilize()
>
> @@ -285,7 +286,8 @@ class iscsi(object):
> self.discovered_targets[(ipaddr, port)] = []
> for node in found_nodes:
> self.discovered_targets[(ipaddr, port)].append([node, False])
> - log.debug("discovered iSCSI node: %s", node.name)
> + log.debug("discovered iSCSI node: %s, %s:%s, %s",
> + node.name, node.address, node.port, node.iface)
>
> # only return the nodes we are not logged into yet
> return [node for (node, logged_in) in
> @@ -317,7 +319,8 @@ class iscsi(object):
> log.error("iSCSI: node not found among discovered")
> except (IOError, ValueError) as e:
> msg = str(e)
> - log.warning("iSCSI: could not log into %s: %s", node.name, msg)
> + log.warning("iSCSI: could not log into %s at %s:%s through %s: %s",
> + node.name, node.address, node.port, node.iface, msg)
>
> return (rc, msg)
>
ACK!
More information about the anaconda-patches
mailing list