Merge pull request #27 from Revolution1/misc/iter-chunck-size-and-ext…

…ra-api-codec

decode out put of metrics_raw, change iter-content chunck size to imp…

etcd3/apis/extra.py

@@ -1,5 +1,7 @@
 from collections import namedtuple
 
+import six
+
 from .base import BaseAPI
 
 EtcdVersion = namedtuple('EtcdVersion', ['etcdserver', 'etcdcluster'])
@@ -34,7 +36,10 @@ def metrics_raw(self):  # pragma: no cover
         """
         resp = self._get(self._url('/metrics'))
         self._raise_for_status(resp)
-        return resp.content
+        metrics = resp.content
+        if not isinstance(metrics, six.text_type):
+            metrics = six.text_type(metrics, encoding='utf-8')
+        return metrics
 
     def metrics(self):  # pragma: no cover
         """

etcd3/client.py

@@ -67,7 +67,9 @@ def iter_response(resp):
     :return: dict
     """
     left_chunk = b''
-    for chunk in resp.iter_content(chunk_size=2048):
+    # https://github.com/coreos/etcd/blob/master/etcdserver/api/v3rpc/maintenance.go#L98
+    # 2**15 < ceil(32*1024/3*4) < 2**16 = 65536
+    for chunk in resp.iter_content(chunk_size=65536):
         chunk = left_chunk + chunk
         for ok, s, _ in iter_json_string(chunk, resp=resp, err_cls=Etcd3StreamError):
             if ok: