fix tests

Author: patrick.qian

source/jormungandr/jormungandr/instance.py

@@ -755,7 +755,7 @@ def socket(self, context):
             start = time.time()
             socket = context.socket(zmq.REQ)
             socket.connect(socket_path)
-            logging.getLogger(__name__).info(
+            logging.getLogger(__name__).debug(
                 "it took %s ms to open a instance socket of %s during a request",
                 '%.2e' % ((time.time() - start) * 1000),
                 self.name,
@@ -769,7 +769,7 @@ def socket(self, context):
                     start = time.time()
                     socket.setsockopt(zmq.LINGER, 0)
                     socket.close()
-                    logging.getLogger(__name__).info(
+                    logging.getLogger(__name__).debug(
                         "it took %s ms to close a instance socket in %s",
                         '%.2e' % ((time.time() - start) * 1000),
                         self.name,
@@ -786,11 +786,9 @@ def send_and_receive(self, *args, **kwargs):
         except pybreaker.CircuitBreakerError as e:
             raise DeadSocketException(self.name, self.socket_path)
 
-    def _send_and_receive(
-        self, request, timeout=app.config.get('INSTANCE_TIMEOUT', 10000), quiet=False, **kwargs
-    ):
+    def _send_and_receive(self, request, timeout=app.config.get('INSTANCE_TIMEOUT', 10), quiet=False, **kwargs):
         logger = logging.getLogger(__name__)
-        deadline = datetime.utcnow() + timedelta(milliseconds=timeout)
+        deadline = datetime.utcnow() + timedelta(milliseconds=timeout * 1000)
         request.deadline = deadline.strftime('%Y%m%dT%H%M%S,%f')
 
         with self.socket(self.context) as socket:
@@ -805,7 +803,7 @@ def _send_and_receive(
                         request.request_id = kwargs['flask_request_id']
 
             socket.send(request.SerializeToString())
-            if socket.poll(timeout=timeout) > 0:
+            if socket.poll(timeout=timeout * 1000) > 0:
                 pb = socket.recv()
                 resp = response_pb2.Response()
                 resp.ParseFromString(pb)
@@ -919,7 +917,7 @@ def init(self):
         request_id = "instance_init"
         try:
             # we use _send_and_receive to avoid the circuit breaker, we don't want fast fail on init :)
-            resp = self._send_and_receive(req, request_id=request_id, timeout=1000, quiet=True)
+            resp = self._send_and_receive(req, request_id=request_id, timeout=1, quiet=True)
             # the instance is automatically updated on a call
             if self.publication_date != pub_date:
                 return True

source/jormungandr/jormungandr/pt_planners/common.py

@@ -47,7 +47,7 @@
 
 class ZmqSocket(six.with_metaclass(ABCMeta, object)):
     def __init__(
-        self, zmq_context, zmq_socket, zmq_socket_type=None, timeout=app.config.get('INSTANCE_TIMEOUT', 10000)
+        self, zmq_context, zmq_socket, zmq_socket_type=None, timeout=app.config.get('INSTANCE_TIMEOUT', 10)
     ):
         self.zmq_socket = zmq_socket
         self.context = zmq_context
@@ -70,7 +70,7 @@ def socket(self, context):
             start = time.time()
             socket = context.socket(zmq.REQ)
             socket.connect(self.zmq_socket)
-            logging.getLogger(__name__).info(
+            logging.getLogger(__name__).debug(
                 "it took %s ms to open a pt_planner socket of %s during a request",
                 '%.2e' % ((time.time() - start) * 1000),
                 self.name,
@@ -83,7 +83,7 @@ def socket(self, context):
                     start = time.time()
                     socket.setsockopt(zmq.LINGER, 0)
                     socket.close()
-                    logging.getLogger(__name__).info(
+                    logging.getLogger(__name__).debug(
                         "it took %s ms to close a pt_planner socket of %s during a request",
                         '%.2e' % ((time.time() - start) * 1000),
                         self.name,
@@ -94,7 +94,7 @@ def socket(self, context):
 
     def _send_and_receive(self, request, quiet=False, **kwargs):
         logger = logging.getLogger(__name__)
-        deadline = datetime.utcnow() + timedelta(milliseconds=self.timeout)
+        deadline = datetime.utcnow() + timedelta(milliseconds=self.timeout * 1000)
         request.deadline = deadline.strftime('%Y%m%dT%H%M%S,%f')
 
         with self.socket(self.context) as socket:
@@ -109,7 +109,7 @@ def _send_and_receive(self, request, quiet=False, **kwargs):
                         request.request_id = kwargs['flask_request_id']
 
             socket.send(request.SerializeToString())
-            if socket.poll(timeout=self.timeout) > 0:
+            if socket.poll(timeout=self.timeout * 1000) > 0:
                 pb = socket.recv()
                 resp = response_pb2.Response()
                 resp.ParseFromString(pb)

source/jormungandr/jormungandr/pt_planners/kraken.py

@@ -37,7 +37,7 @@
 
 class Kraken(ZmqSocket, AbstractPtPlanner):
     def __init__(
-        self, name, zmq_context, zmq_socket, zmq_socket_type, timeout=app.config.get('INSTANCE_TIMEOUT', 10000)
+        self, name, zmq_context, zmq_socket, zmq_socket_type, timeout=app.config.get('INSTANCE_TIMEOUT', 10)
     ):
         super(Kraken, self).__init__(zmq_context, zmq_socket, zmq_socket_type, timeout)
         self.name = "pt_planner:{}".format(name)

source/jormungandr/jormungandr/pt_planners/loki.py

@@ -45,7 +45,7 @@ def __init__(
         zmq_context,
         zmq_socket,
         zmq_socket_type=None,
-        timeout=app.config.get('INSTANCE_TIMEOUT', 10000),
+        timeout=app.config.get('INSTANCE_TIMEOUT', 10),
     ):
 
         super(Loki, self).__init__(zmq_context, zmq_socket, zmq_socket_type, timeout)

source/jormungandr/jormungandr/transient_socket.py

@@ -99,7 +99,7 @@ def socket(self):
             socket = self._zmq_context.socket(zmq.REQ)
             socket.connect(self._socket_path)
             t = time.time()
-            logging.getLogger(__name__).info(
+            logging.getLogger(__name__).debug(
                 "it took %s ms to open a asgard socket of %s during a request",
                 '%.2e' % ((time.time() - start) * 1000),
                 self.name,
@@ -115,7 +115,7 @@ def socket(self):
                 if time.time() - t >= self.ttl:
                     start = time.time()
                     self.close_socket(socket, self.name)
-                    logging.getLogger(__name__).info(
+                    logging.getLogger(__name__).debug(
                         "it took %s ms to close a asgard socket of %s during a request",
                         '%.2e' % ((time.time() - start) * 1000),
                         self.name,
@@ -142,13 +142,13 @@ def _reap(cls, o, sockets):
         start = time.time()
         for _, socket in sockets_to_be_closed:
             cls.close_socket(socket, o.name)
-        logging.getLogger(__name__).info(
+        logging.getLogger(__name__).debug(
             "it took %s ms to reap all asgard sockets of %s", time.time() - start, o.name
         )
 
     @classmethod
     def _reap_sockets(cls):
-        cls._logger.info("reaping sockets")
+        cls._logger.debug("reaping sockets")
         for o, sockets in six.iteritems(cls._sockets):
             TransientSocket._reap(o, sockets)
 

source/jormungandr/tests/integration_tests_settings.py

@@ -35,7 +35,7 @@
 
 DISABLE_DATABASE = True
 # for tests we want only 1/2 seconds timeout instead of the normal 10s
-INSTANCE_TIMEOUT = int(os.environ.get('CUSTOM_INSTANCE_TIMEOUT', 500))
+INSTANCE_TIMEOUT = float(os.environ.get('CUSTOM_INSTANCE_TIMEOUT_S', 0.5))
 STAT_CIRCUIT_BREAKER_MAX_FAIL = int(os.getenv('JORMUNGANDR_STAT_CIRCUIT_BREAKER_MAX_FAIL', 1000))
 STAT_CIRCUIT_BREAKER_TIMEOUT_S = int(os.getenv('JORMUNGANDR_STAT_CIRCUIT_BREAKER_TIMEOUT_S', 1))