Add refresh nodes function name param to MeshConnection ctor

Author: msiomkin

tarantool/mesh_connection.py

@@ -37,13 +37,15 @@ def __init__(self, addrs,
                  connect_now=True,
                  encoding=ENCODING_DEFAULT,
                  strategy_class=RoundRobinStrategy,
+                 get_nodes_function_name=None,
                  nodes_refresh_interval=NODES_REFRESH_INTERVAL):
         self.nattempts = 2 * len(addrs) + 1
         self.strategy = strategy_class(addrs)
         self.strategy_class = strategy_class
         addr = self.strategy.getnext()
         host = addr['host']
         port = addr['port']
+        self.get_nodes_function_name = get_nodes_function_name
         self.nodes_refresh_interval = nodes_refresh_interval
         self.last_nodes_refresh = 0
         super(MeshConnection, self).__init__(host=host,
@@ -70,19 +72,14 @@ def _opt_reconnect(self):
         else:
             raise NetworkError
 
-        if self.authenticated:
+        if self.authenticated and self.get_nodes_function_name:
             now = time.time()
             if now - self.last_nodes_refresh > self.nodes_refresh_interval:
                 self.refresh_nodes(now)
 
     def refresh_nodes(self, cur_time):
-        resp = super(MeshConnection, self).eval_ex('return get_nodes ~= nil',
+        resp = super(MeshConnection, self).call_ex(self.get_nodes_function_name,
                                                    [], reconnect=False)
-        if not (resp.data and resp.data[0]):
-            return
-
-        resp = super(MeshConnection, self).call_ex('get_nodes', [],
-                                                   reconnect=False)
 
         if not (resp.data and resp.data[0]):
             return

unit/suites/test_reconnect.py

@@ -112,6 +112,7 @@ def test_03_mesh(self):
             'host': self.srv.host, 'port': self.srv.args['primary']}],
             user='test',
             password='test',
+            get_nodes_function_name='get_nodes',
             connect_now=True)
 
         # Check we work with the first server
@@ -171,6 +172,7 @@ def test_04_mesh_exclude_node(self):
             'host': self.srv.host, 'port': self.srv.args['primary']}],
             user='test',
             password='test',
+            get_nodes_function_name='get_nodes',
             connect_now=True)
 
         # Check we work with the second server