First stab at mysql pools with context

salt/loader.py

@@ -158,7 +158,7 @@ def returners(opts, functions, whitelist=None, context=None):
     Returns the returner modules
     '''
     if context is None:
-        conext = {}
+        context = {}
     return LazyLoader(_module_dirs(opts, 'returners', 'returner'),
                       opts,
                       tag='returner',

salt/returners/mysql.py

@@ -156,14 +156,26 @@ def _get_serv(ret=None, commit=False):
     Return a mysql cursor
     '''
     _options = _get_options(ret)
-    try:
+
-        conn = MySQLdb.connect(host=_options.get('host'),
+    if __context__ and 'mysql_returner_conn' in __context__:
-                               user=_options.get('user'),
+        log.debug('Reusing MySQL connection pool')
-                               passwd=_options.get('pass'),
+        conn = __context__['mysql_returner_conn']
-                               db=_options.get('db'),
+    else:
-                               port=_options.get('port'))
+        log.debug('Generating new MySQL connection pool')
-    except MySQLdb.connections.OperationalError as exc:
+        try:
-        raise salt.exceptions.SaltMasterError('MySQL returner could not connect to database: {exc}'.format(exc=exc))
+            conn = MySQLdb.connect(host=_options.get('host'),
+                                   user=_options.get('user'),
+                                   passwd=_options.get('pass'),
+                                   db=_options.get('db'),
+                                   port=_options.get('port'),
+                                   pool_size=32)
+
+            try:
+                __context__['mysql_returner_conn'] = conn
+            except TypeError:
+                pass
+        except MySQLdb.connections.OperationalError as exc:
+            raise salt.exceptions.SaltMasterError('MySQL returner could not connect to database: {exc}'.format(exc=exc))
     cursor = conn.cursor()
     try:
         yield cursor