Procházet zdrojové kódy

Fix backup writer offset logging

This patch fixes duplicate offset logging, and also adds verbose logging to
the HTTP writer as well.
Daniel Vincze před 3 roky
rodič
revize
a6dacae8eb
1 změnil soubory, kde provedl 10 přidání a 4 odebrání
  1. 10 4
      coriolis/providers/backup_writers.py

+ 10 - 4
coriolis/providers/backup_writers.py

@@ -281,7 +281,7 @@ class SSHBackupWriterImpl(BaseBackupWriterImpl):
             "Guest path: %(path)s, offset: %(offset)d, content len: "
             "Guest path: %(path)s, offset: %(offset)d, content len: "
             "%(content_len)d, msg len: %(msg_len)d",
             "%(content_len)d, msg len: %(msg_len)d",
             {"path": self._path,
             {"path": self._path,
-             "offset": self._offset,
+             "offset": offset,
              "content_len": len(content),
              "content_len": len(content),
              "msg_len": len(msg)})
              "msg_len": len(msg)})
         return msg
         return msg
@@ -658,10 +658,16 @@ class HTTPBackupWriterImpl(BaseBackupWriterImpl):
             @utils.retry_on_error()
             @utils.retry_on_error()
             def send():
             def send():
                 self._ensure_session()
                 self._ensure_session()
+                chunk = copy.copy(payload["chunk"])
+                LOG.debug(
+                    "Guest path: %(path)s, offset: %(offset)d, content len: "
+                    "%(content_len)d",
+                    {"path": self._path,
+                     "offset": offset,
+                     "content_len": len(chunk)})
                 resp = self._session.post(
                 resp = self._session.post(
-                    self._uri, headers=headers, data=copy.copy(payload["chunk"]),
-                    timeout=CONF.default_requests_timeout
-                )
+                    self._uri, headers=headers, data=chunk,
+                    timeout=CONF.default_requests_timeout)
                 LOG.debug(
                 LOG.debug(
                     "Response code: %r, content: %r" %
                     "Response code: %r, content: %r" %
                     (resp.status_code, resp.content))
                     (resp.status_code, resp.content))