Using show all slaves status when using MariaDB to be consistent with MySQL

plugins/modules/mysql_info.py

@@ -5,6 +5,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
+
 __metaclass__ = type
 
 DOCUMENTATION = r'''
@@ -325,9 +326,10 @@
         5. add info about the new subset with an example to RETURN block
     """
 
-    def __init__(self, module, cursor):
+    def __init__(self, module, cursor, server_implementation):
         self.module = module
         self.cursor = cursor
+        self.server_implementation = server_implementation
         self.info = {
             'version': {},
             'databases': {},
@@ -387,6 +389,18 @@
             self.__collect(exclude_fields, return_empty_dbs, set(self.info))
             return self.info
 
+    def is_mariadb(self):
+        if self.server_implementation == "mariadb":
+            return True
+        else:
+            return False
+
+    def is_mysql(self):
+        if self.server_implementation == "mysql":
+            return True
+        else:
+            return False
+
     def __collect(self, exclude_fields, return_empty_dbs, wanted):
         """Collect all possible subsets."""
         if 'version' in wanted or 'settings' in wanted:
@@ -497,7 +511,10 @@
 
     def __get_slave_status(self):
         """Get slave status if the instance is a slave."""
-        res = self.__exec_sql('SHOW SLAVE STATUS')
+        if self.is_mariadb():
+            res = self.__exec_sql('SHOW ALL SLAVES STATUS')
+        else:
+            res = self.__exec_sql('SHOW SLAVE STATUS')
         if res:
             for line in res:
                 host = line['Master_Host']
@@ -738,10 +755,16 @@
                'Exception message: %s' % (connector_name, connector_version, config_file, to_native(e)))
         module.fail_json(msg)
 
+    cursor.execute("SELECT VERSION()")
+    if 'mariadb' in cursor.fetchone()["VERSION()"].lower():
+        server_implementation = "mariadb"
+    else:
+        server_implementation = "mysql"
+
     ###############################
     # Create object and do main job
 
-    mysql = MySQL_Info(module, cursor)
+    mysql = MySQL_Info(module, cursor, server_implementation)
 
     module.exit_json(changed=False,
                      connector_name=connector_name,

tests/unit/plugins/modules/test_mysql_info.py

@@ -14,15 +14,15 @@
 
 
 @pytest.mark.parametrize(
-    'suffix,cursor_output',
+    'suffix,cursor_output,server_implementation',
     [
-        ('mysql', '5.5.1-mysql'),
-        ('log', '5.7.31-log'),
-        ('mariadb', '10.5.0-mariadb'),
-        ('', '8.0.22'),
+        ('mysql', '5.5.1-mysql', 'mysql'),
+        ('log', '5.7.31-log', 'mysql'),
+        ('mariadb', '10.5.0-mariadb', 'mariadb'),
+        ('', '8.0.22', 'mysql'),
     ]
 )
-def test_get_info_suffix(suffix, cursor_output):
+def test_get_info_suffix(suffix, cursor_output, server_implementation):
     def __cursor_return_value(input_parameter):
         if input_parameter == "SHOW GLOBAL VARIABLES":
             cursor.fetchall.return_value = [{"Variable_name": "version", "Value": cursor_output}]
@@ -32,6 +32,36 @@ def __cursor_return_value(input_parameter):
     cursor = MagicMock()
     cursor.execute.side_effect = __cursor_return_value
 
-    info = MySQL_Info(MagicMock(), cursor)
+    info = MySQL_Info(MagicMock(), cursor, server_implementation)
 
     assert info.get_info([], [], False)['version']['suffix'] == suffix
+
+
+@pytest.mark.parametrize(
+    'server_implementation',
+    [
+        ('mysql'),
+        ('mariadb'),
+    ]
+)
+def test_is_mariadb(server_implementation):
+    cursor = MagicMock()
+
+    info = MySQL_Info(MagicMock(), cursor, server_implementation)
+
+    assert info.is_mariadb() == (server_implementation == "mariadb")
+
+
+@pytest.mark.parametrize(
+    'server_implementation',
+    [
+        ('mysql'),
+        ('mariadb'),
+    ]
+)
+def test_is_mysql(server_implementation):
+    cursor = MagicMock()
+
+    info = MySQL_Info(MagicMock(), cursor, server_implementation)
+
+    assert info.is_mysql() == (server_implementation == "mysql")