1 files changed, 47 insertions, 10 deletions

diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_init.py b/glustolibs-gluster/glustolibs/gluster/gluster_init.py
index 29059e6a1..6a49ffc8b 100644
--- a/glustolibs-gluster/glustolibs/gluster/gluster_init.py
+++ b/glustolibs-gluster/glustolibs/gluster/gluster_init.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#  Copyright (C) 2015-2020  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2015-2020 Red Hat, Inc. <http://www.redhat.com>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -23,13 +23,17 @@ from time import sleep
 from glusto.core import Glusto as g
 
 
-def start_glusterd(servers):
+def start_glusterd(servers, enable_retry=True):
     """Starts glusterd on specified servers if they are not running.
 
     Args:
         servers (str|list): A server|List of server hosts on which glusterd
             has to be started.
 
+    Kwargs:
+        enable_retry(Bool): If set to True then runs reset-failed else
+                            do nothing.
+
     Returns:
         bool : True if starting glusterd is successful on all servers.
             False otherwise.
@@ -46,10 +50,13 @@ def start_glusterd(servers):
         if retcode != 0:
             g.log.error("Unable to start glusterd on server %s", server)
             _rc = False
-    if not _rc:
-        return False
+    if not _rc and enable_retry:
+        ret = reset_failed_glusterd(servers)
+        if ret:
+            ret = start_glusterd(servers)
+        return ret
 
-    return True
+    return _rc
 
 
 def stop_glusterd(servers):
@@ -81,13 +88,17 @@ def stop_glusterd(servers):
     return True
 
 
-def restart_glusterd(servers):
+def restart_glusterd(servers, enable_retry=True):
     """Restart the glusterd on specified servers.
 
     Args:
         servers (str|list): A server|List of server hosts on which glusterd
             has to be restarted.
 
+    Kwargs:
+        enable_retry(Bool): If set to True than runs reset-failed else
+                            do nothing.
+
     Returns:
         bool : True if restarting glusterd is successful on all servers.
             False otherwise.
@@ -104,9 +115,35 @@ def restart_glusterd(servers):
         if retcode != 0:
             g.log.error("Unable to restart glusterd on server %s", server)
             _rc = False
-    if not _rc:
-        return False
+    if not _rc and enable_retry:
+        ret = reset_failed_glusterd(servers)
+        if ret:
+            ret = restart_glusterd(servers)
+        return ret
+    return _rc
+
+
+def reset_failed_glusterd(servers):
+    """Reset-failed glusterd on specified servers.
+
+    Args:
+        servers (str|list): A server|List of server hosts on which glusterd
+            has to be reset-failed.
+
+    Returns:
+        bool : True if reset-failed glusterd is successful on all servers.
+            False otherwise.
+    """
+    if not isinstance(servers, list):
+        servers = [servers]
+
+    cmd = "systemctl reset-failed glusterd"
+    results = g.run_parallel(servers, cmd)
 
+    for server, (retcode, _, _) in results.items():
+        if retcode:
+            g.log.error("Unable to reset glusterd on server %s", server)
+            return False
     return True
 
 
@@ -260,10 +297,10 @@ def get_gluster_version(host):
         host(str): IP of the host whose gluster version has to be checked.
 
     Returns:
-        (float): The gluster version value.
+        str: The gluster version value.
     """
     command = 'gluster --version'
     _, out, _ = g.run(host, command)
     g.log.info("The Gluster verion of the cluster under test is %s",
                out)
-    return float(out.split(' ')[1])
+    return out.split(' ')[1]