Merge lp:~martinarrieta/mysql-fabric/BUG-71445 into lp:mysql-fabric

[Martin Arrieta]

Hello,

I have added the Json support for the returned string and I also have added a dispatcher method for the Group Health as an example about why this Json string is useful.

For example:

# mysqlfabric group health test1
Group health:
 serverid = 12f4a168-d08e-11e3-92cf-08002760fc47
  is_alive = False
  status = FAULTY
  address = 192.168.70.102
  threads = {}
 serverid = 1189e6be-d08e-11e3-92cf-08002760fc47
  is_alive = False
  status = FAULTY
  address = 192.168.70.103
  threads = {}
 serverid = 0efa44fb-d08e-11e3-92cf-08002760fc47
  is_alive = False
  status = FAULTY
  address = 192.168.70.104
  threads = {}

We can try to re-wrinte the default dispatcher to iterate the result in order to make a "general" solution, but this will depend if you like the idea or not.

Please let me know what do you think and if you want to change anything feel free to do it or let me know it and I'll do it.

Regards,

Martin Arrieta.
@martinarrietac

[lp:~martinarrieta/mysql-fabric/BUG-71445]

227. By Martin Arrieta on 2014-05-04

Changed the method from dispatcher to command_status

228. By Martin Arrieta on 2014-05-04

Fixed error with groups that does not exist

Unmerged revisions

228. By Martin Arrieta on 2014-05-04

Fixed error with groups that does not exist

227. By Martin Arrieta on 2014-05-04

Changed the method from dispatcher to command_status

226. By Martin Arrieta on 2014-05-04

fixex the group health command

225. By Martin Arrieta on 2014-05-03

Adding Json support for the result

224. By Martin Arrieta on 2014-05-02

added the address of the servers to the group health command

=== modified file 'lib/mysql/fabric/command.py'
--- lib/mysql/fabric/command.py	2014-03-07 06:36:46 +0000
+++ lib/mysql/fabric/command.py	2014-05-04 23:21:53 +0000
@@ -42,6 +42,8 @@
 import functools
 import traceback
 
+import json
+
 import mysql.fabric.errors as _errors
 import mysql.fabric.executor as _executor
 
@@ -452,13 +454,13 @@
         :param params: The parameters to the function
 
         :return: {success:True/False, message:<for example exception>,
-                return:<return values>}.
+                return:<Json string with return values>}.
         """
         try:
             status = func(*params)
         except Exception:
             return [False, traceback.format_exc(), True]
-        return [True, "", status]
+        return [True, "", json.dumps(status)]
 
 
 class ProcedureCommand(Command):

=== modified file 'lib/mysql/fabric/services/health.py'
--- lib/mysql/fabric/services/health.py	2014-02-24 15:18:57 +0000
+++ lib/mysql/fabric/services/health.py	2014-05-04 23:21:53 +0000
@@ -28,6 +28,8 @@
     Command,
 )
 
+import json
+
 _LOGGER = logging.getLogger(__name__)
 
 class CheckHealth(Command):
@@ -51,6 +53,40 @@
         """
         return Command.generate_output_pattern(_health, group_id)
 
+    @staticmethod
+    def command_status(status, details=False):
+        """Present the result reported by a command in a friendly-user way.
+
+        :param status: The command status.
+        :param details: Whether details on failures should be printed or
+                        not.
+        """
+        
+        returned = ""
+        
+        if not isinstance(status, list):
+            returned = status
+        elif not isinstance(status[0], bool):
+            returned = status
+        else:
+            returned = "Group health:\n"
+            
+            if status[0]:
+                health = json.loads(status[2])
+                for i in health.items():
+                    returned += "\n".join([
+                        " serverid    = %s" % (i[0], ),
+                        "  is_alive   = %s" % (i[1]['is_alive'] ),
+                        "  status     = %s" % (i[1]['status'] ),
+                        "  address    = %s" % (i[1]['address'] ),
+                        "  threads    = %s"  % (i[1]['threads'] ),
+                        ""
+                        ])
+            else:
+                returned = status[1].split("\n")[-2]
+                        
+        return returned
+
 def _health(group_id):
     """Check which servers in a group are up and down.
     """
@@ -65,7 +101,9 @@
         is_master = (group.master == server.uuid)
         thread_issues = {}
         status = server.status
-        try:
+        address = server.address
+        
+	try:
             server.connect()
             alive = True
             if not is_master:
@@ -84,7 +122,8 @@
         availability[str(server.uuid)] = {
             "is_alive" : alive,
             "status" : status,
-            "threads" : thread_issues
+            "threads" : thread_issues,
+            "address" : address
             }
 
     return availability