BUG19331658: Fix connection pooling with MySQL Fabric

peeyushgupta · peeyushgupta · commit 142dba95c57b · 2014-12-04T12:27:48.000+05:30
Using connection pooling with MySQL Fabric was raising AttributeError.
We fix this by creating a pool of connections to a server as and when
first time it is required to be connected.

To use pooling with Fabric, 'pool_size' argument should be used. Using
'pool_name' with Fabric raises AttributeError. This is because
we can't have two pools with same names on different servers.

A unit test has been added for BUG#19331658.
diff --git a/lib/mysql/connector/__init__.py b/lib/mysql/connector/__init__.py
@@ -139,6 +139,9 @@ def connect(*args, **kwargs):
         raise InterfaceError("fabric and failover arguments can not be used")
 
     if 'fabric' in kwargs:
+        if 'pool_name' in kwargs:
+            raise AttributeError("'pool_name' argument is not supported with "
+                                 " MySQL Fabric. Use 'pool_size' instead.")
         from .fabric import connect as fabric_connect
         return fabric_connect(*args, **kwargs)
 
diff --git a/lib/mysql/connector/fabric/connection.py b/lib/mysql/connector/fabric/connection.py
@@ -61,7 +61,7 @@
         HAVE_SSL = True
 # pylint: enable=F0401,E0611
 
-from ..connection import MySQLConnection
+import ...connector import connect
 from ..pooling import MySQLConnectionPool
 from ..errors import (
     Error, InterfaceError, NotSupportedError, MySQLFabricError, InternalError,
@@ -1123,6 +1123,8 @@ def store_config(self, **kwargs):
             del test_config['pool_name']
         if 'pool_size' in test_config:
             del test_config['pool_size']
+        if 'pool_reset_session' in test_config:
+            del test_config['pool_reset_session']
         try:
             pool = MySQLConnectionPool(pool_name=str(uuid.uuid4()))
             pool.set_config(**test_config)
@@ -1186,7 +1188,7 @@ def _connect(self):
             dbconfig['host'] = mysqlserver.host
             dbconfig['port'] = mysqlserver.port
             try:
-                self._mysql_cnx = MySQLConnection(**dbconfig)
+                self._mysql_cnx = connect(**dbconfig)
             except Error as exc:
                 if counter == attempts:
                     self.reset_cache(mysqlserver.group)
diff --git a/tests/test_fabric.py b/tests/test_fabric.py
@@ -41,6 +41,7 @@
 from mysql.connector import fabric, errorcode
 from mysql.connector.fabric import connection, balancing
 from mysql.connector.catch23 import UNICODE_TYPES, PY2
+from mysql.connector.pooling import PooledMySQLConnection
 
 ERR_NO_FABRIC_CONFIG = "Fabric configuration not available"
 
@@ -578,3 +579,42 @@ def test_bug19642249(self):
             self.assertEqual("Key invalid; was '1977-01-01'", str(exc))
         else:
             self.fail("ValueError not raised")
+
+    def test_bug19331658(self):
+        """Pooling not working with fabric
+        """
+        self.assertRaises(
+            AttributeError, mysql.connector.connect,
+            fabric=tests.FABRIC_CONFIG, user='root', database='employees',
+            pool_name='mypool')
+
+        pool_size = 2
+        cnx = mysql.connector.connect(
+            fabric=tests.FABRIC_CONFIG, user='root', database='employees',
+            pool_size=pool_size, pool_reset_session=False
+        )
+        tbl_name = "employees_range"
+
+        tables = ["employees.{0}".format(tbl_name)]
+
+        cnx.set_property(tables=tables,
+                         scope=fabric.SCOPE_GLOBAL,
+                         mode=fabric.MODE_READWRITE)
+        cnx.cursor()
+        self.assertTrue(isinstance(cnx._mysql_cnx, PooledMySQLConnection))
+
+        data = self.emp_data[1985]
+
+        for emp in data:
+            cnx.set_property(tables=tables,
+                             key=emp[0],
+                             scope=fabric.SCOPE_LOCAL,
+                             mode=fabric.MODE_READWRITE)
+            cnx.cursor()
+            mysqlserver = cnx._fabric_mysql_server
+            config = cnx._mysql_config
+            self.assertEqual(
+                cnx._mysql_cnx.pool_name, "{0}_{1}_{2}_{3}".format(
+                    mysqlserver.host, mysqlserver.port, config['user'],
+                    config['database'])
+            )
