py-pve-cloud-backup 3.5.1__tar.gz → 3.5.3__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.
- {py_pve_cloud_backup-3.5.1/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.3}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.3/src/pve_cloud_backup/_version.py +1 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/bdd.py +3 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/restore.py +0 -1
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/net.py +13 -21
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3/src/py_pve_cloud_backup.egg-info}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.1/src/pve_cloud_backup/_version.py +0 -1
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/LICENSE.md +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/README.md +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/pyproject.toml +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/requirements.txt +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/setup.cfg +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/brctl.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/ext_zfs.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/git.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/main.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/requires.txt +0 -0
- {py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.5.3"
|
|
@@ -94,7 +94,9 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
94
94
|
chunk_size = struct.unpack("!I", (await reader.readexactly(4)))[
|
|
95
95
|
0
|
|
96
96
|
]
|
|
97
|
+
logger.debug(f"received chunk size {chunk_size}")
|
|
97
98
|
if chunk_size == 0:
|
|
99
|
+
logger.debug("received chunk size 0, finished")
|
|
98
100
|
break # client sends 0 chunk size at the end to signal that its finished uploading
|
|
99
101
|
chunk = await reader.readexactly(chunk_size)
|
|
100
102
|
|
|
@@ -106,6 +108,7 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
106
108
|
|
|
107
109
|
# the decompressor does not always return a decompressed chunk but might retain
|
|
108
110
|
# and return empty. at the end we need to call flush to get everything out
|
|
111
|
+
logger.debug("flushing, draining and closing")
|
|
109
112
|
borg_proc.stdin.write(decompressor.flush())
|
|
110
113
|
await borg_proc.stdin.drain()
|
|
111
114
|
|
|
@@ -72,10 +72,15 @@ async def get_sio_mc_client(backup_addr):
|
|
|
72
72
|
},
|
|
73
73
|
transports=["websocket"],
|
|
74
74
|
)
|
|
75
|
-
|
|
75
|
+
logger.debug(f"Connected sio client to {backup_addr}")
|
|
76
76
|
return sio
|
|
77
77
|
|
|
78
78
|
|
|
79
|
+
async def sio_send_cchunk(sio, compressed_chunk):
|
|
80
|
+
if compressed_chunk:
|
|
81
|
+
await sio.call("backup_chunk", compressed_chunk)
|
|
82
|
+
|
|
83
|
+
|
|
79
84
|
# compress parameter exists for chunk generators that already do the compression
|
|
80
85
|
# the receiving side ALWAYS expects a compressed stream
|
|
81
86
|
async def archive_async(backup_addr, request_dict, chunk_generator, compress=True):
|
|
@@ -86,12 +91,14 @@ async def archive_async(backup_addr, request_dict, chunk_generator, compress=Tru
|
|
|
86
91
|
# connection to mc gw
|
|
87
92
|
sio = await get_sio_mc_client(backup_addr)
|
|
88
93
|
|
|
94
|
+
logger.debug("sending archive init call")
|
|
89
95
|
result = await sio.call(
|
|
90
96
|
"archive_init",
|
|
91
97
|
request_dict,
|
|
92
98
|
timeout=30,
|
|
93
99
|
)
|
|
94
100
|
|
|
101
|
+
logger.debug(f"init response {result['ok']}")
|
|
95
102
|
if not result["ok"]:
|
|
96
103
|
raise RuntimeError(result["error"])
|
|
97
104
|
|
|
@@ -102,15 +109,9 @@ async def archive_async(backup_addr, request_dict, chunk_generator, compress=Tru
|
|
|
102
109
|
).compressobj()
|
|
103
110
|
|
|
104
111
|
async for chunk in chunk_generator():
|
|
105
|
-
await sio.
|
|
106
|
-
"backup_chunk",
|
|
107
|
-
compressor.compress(chunk),
|
|
108
|
-
)
|
|
112
|
+
await sio_send_cchunk(sio, compressor.compress(chunk))
|
|
109
113
|
|
|
110
|
-
await sio.
|
|
111
|
-
"backup_chunk",
|
|
112
|
-
compressor.flush(),
|
|
113
|
-
)
|
|
114
|
+
await sio_send_cchunk(sio, compressor.flush())
|
|
114
115
|
|
|
115
116
|
else:
|
|
116
117
|
async for chunk in chunk_generator():
|
|
@@ -151,7 +152,6 @@ async def archive_async(backup_addr, request_dict, chunk_generator, compress=Tru
|
|
|
151
152
|
|
|
152
153
|
# close the writer here, stdout needs to be closed by caller
|
|
153
154
|
writer.close()
|
|
154
|
-
await writer.wait_closed()
|
|
155
155
|
|
|
156
156
|
|
|
157
157
|
async def archive(backup_addr, request_dict, chunk_generator):
|
|
@@ -174,15 +174,9 @@ async def archive(backup_addr, request_dict, chunk_generator):
|
|
|
174
174
|
).compressobj()
|
|
175
175
|
|
|
176
176
|
for chunk in chunk_generator():
|
|
177
|
-
await sio.
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
)
|
|
181
|
-
|
|
182
|
-
await sio.call(
|
|
183
|
-
"backup_chunk",
|
|
184
|
-
compressor.flush(),
|
|
185
|
-
)
|
|
177
|
+
await sio_send_cchunk(sio, compressor.compress(chunk))
|
|
178
|
+
|
|
179
|
+
await sio_send_cchunk(sio, compressor.flush())
|
|
186
180
|
|
|
187
181
|
await sio.call("backup_eof")
|
|
188
182
|
|
|
@@ -212,7 +206,6 @@ async def archive(backup_addr, request_dict, chunk_generator):
|
|
|
212
206
|
|
|
213
207
|
# close the writer here, stdout needs to be closed by caller
|
|
214
208
|
writer.close()
|
|
215
|
-
await writer.wait_closed()
|
|
216
209
|
|
|
217
210
|
|
|
218
211
|
async def meta(backup_addr, cmd, meta_dict):
|
|
@@ -241,7 +234,6 @@ async def meta(backup_addr, cmd, meta_dict):
|
|
|
241
234
|
await writer.drain()
|
|
242
235
|
|
|
243
236
|
writer.close()
|
|
244
|
-
await writer.wait_closed()
|
|
245
237
|
|
|
246
238
|
|
|
247
239
|
async def volume_meta(backup_addr, meta_dict):
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "3.5.1"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/brctl.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/daemon/funcs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/ext_zfs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/funcs.py
RENAMED
|
File without changes
|
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/main.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/nextcloud.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/pve_cloud_backup/fetcher/patroni.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.1 → py_pve_cloud_backup-3.5.3}/src/py_pve_cloud_backup.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|