py-pve-cloud-backup 3.5.5__tar.gz → 3.5.7__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. {py_pve_cloud_backup-3.5.5/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.7}/PKG-INFO +1 -1
  2. py_pve_cloud_backup-3.5.7/src/pve_cloud_backup/_version.py +1 -0
  3. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/daemon/bdd.py +4 -3
  4. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/net.py +29 -18
  5. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7/src/py_pve_cloud_backup.egg-info}/PKG-INFO +1 -1
  6. py_pve_cloud_backup-3.5.5/src/pve_cloud_backup/_version.py +0 -1
  7. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/LICENSE.md +0 -0
  8. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/README.md +0 -0
  9. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/pyproject.toml +0 -0
  10. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/requirements.txt +0 -0
  11. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/setup.cfg +0 -0
  12. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/daemon/brctl.py +0 -0
  13. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/daemon/funcs.py +0 -0
  14. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/daemon/restore.py +0 -0
  15. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/ext_zfs.py +0 -0
  16. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/funcs.py +0 -0
  17. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/git.py +0 -0
  18. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/main.py +0 -0
  19. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
  20. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
  21. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
  22. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
  23. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
  24. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/py_pve_cloud_backup.egg-info/requires.txt +0 -0
  25. {py_pve_cloud_backup-3.5.5 → py_pve_cloud_backup-3.5.7}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: py-pve-cloud-backup
3
- Version: 3.5.5
3
+ Version: 3.5.7
4
4
  Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
5
5
  License-Expression: GPL-3.0-or-later
6
6
  License-File: LICENSE.md
@@ -0,0 +1 @@
1
+ __version__ = "3.5.7"
@@ -27,6 +27,7 @@ BACKUP_TYPES = ["k8s", "nextcloud", "git", "postgres"]
27
27
  lock_dict = {}
28
28
  lock_dict_lock = asyncio.Lock()
29
29
 
30
+
30
31
  # to prevent from writing to the same borg archive parallel
31
32
  async def get_lock(backup_dir):
32
33
  async with lock_dict_lock:
@@ -74,13 +75,12 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
74
75
  logger.info(f"accuired lock {backup_dir}")
75
76
  break
76
77
  except asyncio.TimeoutError:
77
- writer.write(b"\x02")
78
+ writer.write(b"\x02") # 0x02 byte means continue waiting
78
79
  await writer.drain()
79
80
  logger.debug("send keepalive waiting for lock, continueing...")
80
81
 
81
82
  try:
82
83
  borg_archive = f"{backup_dir}::{archive_name}_{timestamp}"
83
- logger.info(f"accuired lock {backup_dir}")
84
84
 
85
85
  # send continue signal, meaning we have the lock and export can start.
86
86
  writer.write(b"\x01") # signal = 0x01 means "continue"
@@ -109,6 +109,7 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
109
109
  0
110
110
  ]
111
111
  logger.debug(f"received chunk size {chunk_size}")
112
+
112
113
  if chunk_size == 0:
113
114
  logger.debug("received chunk size 0, finished")
114
115
  break # client sends 0 chunk size at the end to signal that its finished uploading
@@ -279,7 +280,7 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
279
280
  logger.info(request_artifact)
280
281
 
281
282
  backup_dir = f"{get_backup_base_dir()}/{request_archive}"
282
- lock = await get_lock(backup_dir):
283
+ lock = await get_lock(backup_dir)
283
284
  async with lock:
284
285
  logger.info(
285
286
  f"running borg extract on {backup_dir}::{request_artifact}"
@@ -89,6 +89,33 @@ async def sio_send_cchunk(sio, compressed_chunk):
89
89
  await sio.call("backup_chunk", compressed_chunk)
90
90
 
91
91
 
92
+ async def wait_archive_init(sio, request_dict):
93
+ initial = await sio.call(
94
+ "archive_init",
95
+ request_dict,
96
+ timeout=30,
97
+ )
98
+ if initial["status"] == "ERR":
99
+ raise RuntimeError(initial["error"])
100
+
101
+ if initial["status"] == "ACQUIRED":
102
+ return
103
+
104
+ logger.info("waiting for lock")
105
+ # status WAIT
106
+ while True:
107
+ wait_call = await sio.call("wait_archive", timeout=30)
108
+
109
+ if wait_call["status"] == "ERR":
110
+ raise RuntimeError(initial["error"])
111
+
112
+ if wait_call["status"] == "ACQUIRED":
113
+ return
114
+
115
+ # continue wait
116
+ logger.info("continueing waiting")
117
+
118
+
92
119
  # compress parameter exists for chunk generators that already do the compression
93
120
  # the receiving side ALWAYS expects a compressed stream
94
121
  async def archive_async(backup_addr, request_dict, chunk_generator, compress=True):
@@ -99,16 +126,7 @@ async def archive_async(backup_addr, request_dict, chunk_generator, compress=Tru
99
126
  # connection to mc gw
100
127
  sio = await get_sio_mc_client(backup_addr)
101
128
 
102
- logger.debug("sending archive init call")
103
- result = await sio.call(
104
- "archive_init",
105
- request_dict,
106
- timeout=30,
107
- )
108
-
109
- logger.debug(f"init response {result['ok']}")
110
- if not result["ok"]:
111
- raise RuntimeError(result["error"])
129
+ await wait_archive_init(sio, request_dict)
112
130
 
113
131
  if compress:
114
132
  compressor = zstd.ZstdCompressor(
@@ -167,14 +185,7 @@ async def archive(backup_addr, request_dict, chunk_generator):
167
185
  if backup_addr.startswith("https://"):
168
186
  sio = await get_sio_mc_client(backup_addr)
169
187
 
170
- result = await sio.call(
171
- "archive_init",
172
- request_dict,
173
- timeout=30,
174
- )
175
-
176
- if not result["ok"]:
177
- raise RuntimeError(result["error"])
188
+ await wait_archive_init(sio, request_dict)
178
189
 
179
190
  compressor = zstd.ZstdCompressor(
180
191
  level=1,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: py-pve-cloud-backup
3
- Version: 3.5.5
3
+ Version: 3.5.7
4
4
  Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
5
5
  License-Expression: GPL-3.0-or-later
6
6
  License-File: LICENSE.md
@@ -1 +0,0 @@
1
- __version__ = "3.5.5"