py-pve-cloud-backup 3.4.1__tar.gz → 3.5.0__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.4.1/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.0}/PKG-INFO +4 -2
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/pyproject.toml +1 -0
- py_pve_cloud_backup-3.5.0/requirements.txt +10 -0
- py_pve_cloud_backup-3.5.0/src/pve_cloud_backup/_version.py +1 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/daemon/bdd.py +24 -23
- py_pve_cloud_backup-3.5.0/src/pve_cloud_backup/daemon/brctl.py +644 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/daemon/funcs.py +1 -34
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/daemon/restore.py +250 -113
- py_pve_cloud_backup-3.5.0/src/pve_cloud_backup/fetcher/ext_zfs.py +74 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/fetcher/funcs.py +37 -7
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/fetcher/main.py +1 -1
- py_pve_cloud_backup-3.5.0/src/pve_cloud_backup/fetcher/net.py +252 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0/src/py_pve_cloud_backup.egg-info}/PKG-INFO +4 -2
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +1 -1
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/py_pve_cloud_backup.egg-info/entry_points.txt +1 -0
- py_pve_cloud_backup-3.5.0/src/py_pve_cloud_backup.egg-info/requires.txt +7 -0
- py_pve_cloud_backup-3.4.1/requirements.txt +0 -6
- py_pve_cloud_backup-3.4.1/src/pve_cloud_backup/_version.py +0 -1
- py_pve_cloud_backup-3.4.1/src/pve_cloud_backup/daemon/brctl.py +0 -402
- py_pve_cloud_backup-3.4.1/src/pve_cloud_backup/daemon/rpc.py +0 -10
- py_pve_cloud_backup-3.4.1/src/pve_cloud_backup/fetcher/net.py +0 -148
- py_pve_cloud_backup-3.4.1/src/py_pve_cloud_backup.egg-info/requires.txt +0 -5
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/LICENSE.md +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/README.md +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/setup.cfg +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/fetcher/git.py +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud_backup-3.4.1 → py_pve_cloud_backup-3.5.0}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
{py_pve_cloud_backup-3.4.1/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.0}/PKG-INFO
RENAMED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: py-pve-cloud-backup
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.5.0
|
|
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
|
|
7
|
-
Requires-Dist: py-pve-cloud<3.
|
|
7
|
+
Requires-Dist: py-pve-cloud<3.5.0,>=3.4.0
|
|
8
8
|
Requires-Dist: kubernetes==34.1.0
|
|
9
9
|
Requires-Dist: requests==2.32.5
|
|
10
10
|
Requires-Dist: zstandard==0.25.0
|
|
11
11
|
Requires-Dist: tinydb==4.8.2
|
|
12
|
+
Requires-Dist: python-socketio[asyncio_client]==5.16.4
|
|
13
|
+
Requires-Dist: aiohttp==3.14.3
|
|
12
14
|
Dynamic: license-file
|
|
@@ -17,4 +17,5 @@ version = {attr = "pve_cloud_backup._version.__version__"}
|
|
|
17
17
|
daemon = "pve_cloud_backup.daemon.bdd:main"
|
|
18
18
|
brctl = "pve_cloud_backup.daemon.brctl:main"
|
|
19
19
|
fetcher = "pve_cloud_backup.fetcher.main:main"
|
|
20
|
+
ext-zfs = "pve_cloud_backup.fetcher.ext_zfs:main"
|
|
20
21
|
pxc-restore = "pve_cloud_backup.daemon.restore:main"
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
# pessimistic operator for local tdd installs (pip install -e .)
|
|
2
|
+
py-pve-cloud>=3.4.0,<3.5.0
|
|
3
|
+
kubernetes==34.1.0
|
|
4
|
+
requests==2.32.5
|
|
5
|
+
zstandard==0.25.0
|
|
6
|
+
# todo: this should probably be moved to top level py-pve-cloud
|
|
7
|
+
# or removed from controller for pickeling
|
|
8
|
+
tinydb==4.8.2
|
|
9
|
+
python-socketio[asyncio_client]==5.16.4
|
|
10
|
+
aiohttp==3.14.3
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.5.0"
|
|
@@ -4,15 +4,14 @@ import os
|
|
|
4
4
|
import pickle
|
|
5
5
|
import ssl
|
|
6
6
|
import struct
|
|
7
|
-
import time
|
|
8
7
|
|
|
9
8
|
import zstandard as zstd
|
|
9
|
+
from pve_cloud.lib.backup_rpc import Command
|
|
10
10
|
from tinydb import Query, TinyDB
|
|
11
11
|
|
|
12
12
|
from pve_cloud_backup.daemon.funcs import (copy_backup_generic,
|
|
13
13
|
get_backup_base_dir,
|
|
14
14
|
get_volume_metas, init_backup_dir)
|
|
15
|
-
from pve_cloud_backup.daemon.rpc import Command
|
|
16
15
|
from pve_cloud_backup.fetcher.net import send_cchunk
|
|
17
16
|
|
|
18
17
|
log_level_str = os.getenv("LOG_LEVEL", "INFO").upper()
|
|
@@ -40,7 +39,7 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
40
39
|
addr = writer.get_extra_info("peername")
|
|
41
40
|
logger.info(f"Connection from {addr}")
|
|
42
41
|
|
|
43
|
-
command = Command(struct.unpack("B", await reader.
|
|
42
|
+
command = Command(struct.unpack("B", await reader.readexactly(1))[0])
|
|
44
43
|
logger.info(f"{addr} send command: {command}")
|
|
45
44
|
|
|
46
45
|
try:
|
|
@@ -223,12 +222,11 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
223
222
|
async with get_lock(db_path):
|
|
224
223
|
secret_db = TinyDB(db_path)
|
|
225
224
|
|
|
226
|
-
# listen for secret requests
|
|
227
|
-
stack = (await reader.readline()).decode().rstrip("\n")
|
|
228
|
-
|
|
229
225
|
Meta = Query()
|
|
230
226
|
ns_secrets = secret_db.get(
|
|
231
|
-
(
|
|
227
|
+
(
|
|
228
|
+
Meta.timestamp == timestamp
|
|
229
|
+
) # timestamp is our unique id for the backup
|
|
232
230
|
)
|
|
233
231
|
|
|
234
232
|
meta_pickled = pickle.dumps(ns_secrets)
|
|
@@ -238,6 +236,9 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
238
236
|
writer.write(meta_pickled)
|
|
239
237
|
await writer.drain()
|
|
240
238
|
|
|
239
|
+
logger.info(
|
|
240
|
+
"send initial config / secrets - waiting for archive requests"
|
|
241
|
+
)
|
|
241
242
|
# next the client requests the archives which we extract here and pipe via a stream
|
|
242
243
|
while True:
|
|
243
244
|
# open the extract process and send the stream the output
|
|
@@ -305,25 +306,25 @@ async def run():
|
|
|
305
306
|
|
|
306
307
|
|
|
307
308
|
def main():
|
|
308
|
-
# wait for drive to be available
|
|
309
|
-
while True:
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
309
|
+
# # wait for drive to be available
|
|
310
|
+
# while True:
|
|
311
|
+
# try:
|
|
312
|
+
# get_backup_base_dir()
|
|
313
|
+
# logger.info("Backup drive is available!")
|
|
314
|
+
# break
|
|
315
|
+
# except FileNotFoundError as e:
|
|
316
|
+
# logger.debug(e)
|
|
317
|
+
# logger.info("Backup drive not found, startup delayed.")
|
|
318
|
+
# time.sleep(5)
|
|
318
319
|
|
|
319
320
|
if ENV == "PRODUCTION":
|
|
320
321
|
copy_backup_generic()
|
|
321
322
|
|
|
322
|
-
backup_store_env_vars = ["PXC_BACKUP_BASE_DIR", "PXC_REMOVABLE_DATASTORES"]
|
|
323
|
-
num_defined = len([var for var in backup_store_env_vars if os.getenv(var)])
|
|
324
|
-
if num_defined != 1:
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
323
|
+
# backup_store_env_vars = ["PXC_BACKUP_BASE_DIR", "PXC_REMOVABLE_DATASTORES"]
|
|
324
|
+
# num_defined = len([var for var in backup_store_env_vars if os.getenv(var)])
|
|
325
|
+
# if num_defined != 1:
|
|
326
|
+
# raise Exception(
|
|
327
|
+
# f"Number of defined backup store vars is {num_defined} but should only be exactly 1 defined!"
|
|
328
|
+
# )
|
|
328
329
|
|
|
329
330
|
asyncio.run(run())
|