Merge branch 'master' into fix-chunk-spliter

gnes-ai · Sep 29, 2019 · d0c9e0d · d0c9e0d
2 parents e60072b + 0bb0082
commit d0c9e0d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/gnes/cli/parser.py b/gnes/cli/parser.py
@@ -330,6 +330,8 @@ def set_frontend_parser(parser=None):
                         help='maximum concurrent connections allowed')
     parser.add_argument('--dump_route', type=argparse.FileType('w', encoding='utf8'),
                         help='dumping route information to a file')
+    parser.add_argument('--max_pending_request', type=int, default=100,
+                        help='maximum number of pending requests allowed, when exceed wait until we receive the response')
     return parser
 
 

diff --git a/gnes/service/frontend.py b/gnes/service/frontend.py
@@ -20,7 +20,6 @@
 import grpc
 from google.protobuf.json_format import MessageToJson
 
-from .. import __version__, __proto_version__
 from ..client.base import ZmqClient
 from ..helper import set_logger, make_route_table
 from ..proto import gnes_pb2_grpc, gnes_pb2, router2str, add_route, add_version
@@ -59,6 +58,7 @@ def __init__(self, args):
                 check_version=self.args.check_version,
                 timeout=self.args.timeout,
                 squeeze_pb=self.args.squeeze_pb)
+            self.pending_request = 0
 
         def add_envelope(self, body: 'gnes_pb2.Request', zmq_client: 'ZmqClient'):
             msg = gnes_pb2.Message()
@@ -104,21 +104,27 @@ def Search(self, request, context):
             return self.Call(request, context)
 
         def StreamCall(self, request_iterator, context):
+            self.pending_request = 0
+
+            def get_response(num_recv, blocked=False):
+                for _ in range(num_recv):
+                    if blocked or zmq_client.receiver.poll(1):
+                        msg = zmq_client.recv_message(**self.send_recv_kwargs)
+                        self.pending_request -= 1
+                        yield self.remove_envelope(msg)
+
             with self.zmq_context as zmq_client:
-                num_request = 0
 
                 for request in request_iterator:
                     zmq_client.send_message(self.add_envelope(request, zmq_client), **self.send_recv_kwargs)
-                    num_request += 1
+                    self.pending_request += 1
 
-                    if zmq_client.receiver.poll(1):
-                        msg = zmq_client.recv_message(**self.send_recv_kwargs)
-                        num_request -= 1
-                        yield self.remove_envelope(msg)
+                    num_recv = max(self.pending_request - self.args.max_pending_request, 1)
+
+                    # switch to blocked recv when too many pending requests
+                    yield from get_response(num_recv, num_recv > 1)
 
-                for _ in range(num_request):
-                    msg = zmq_client.recv_message(**self.send_recv_kwargs)
-                    yield self.remove_envelope(msg)
+                yield from get_response(self.pending_request, blocked=True)
 
         class ZmqContext:
             """The zmq context class."""