py-pve-cloud-backup 3.5.3__tar.gz → 3.5.4__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.3/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.4}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.4/src/pve_cloud_backup/_version.py +1 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/bdd.py +18 -2
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/net.py +12 -4
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4/src/py_pve_cloud_backup.egg-info}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.3/src/pve_cloud_backup/_version.py +0 -1
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/LICENSE.md +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/README.md +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/pyproject.toml +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/requirements.txt +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/setup.cfg +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/brctl.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/restore.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/ext_zfs.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/git.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/main.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/py_pve_cloud_backup.egg-info/requires.txt +0 -0
- {py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.5.4"
|
|
@@ -63,8 +63,21 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
63
63
|
else:
|
|
64
64
|
backup_dir = init_backup_dir(borg_archive_type)
|
|
65
65
|
|
|
66
|
-
#
|
|
67
|
-
|
|
66
|
+
# send ping pong while waiting on lock
|
|
67
|
+
# maybe this is also needed in other rpc call types
|
|
68
|
+
lock = get_lock(backup_dir)
|
|
69
|
+
|
|
70
|
+
while True:
|
|
71
|
+
try:
|
|
72
|
+
await asyncio.wait_for(lock.acquire(), timeout=5)
|
|
73
|
+
logger.info(f"accuired lock {backup_dir}")
|
|
74
|
+
break
|
|
75
|
+
except asyncio.TimeoutError:
|
|
76
|
+
writer.write(b"\x02")
|
|
77
|
+
await writer.drain()
|
|
78
|
+
logger.debug("send keepalive waiting for lock, continueing...")
|
|
79
|
+
|
|
80
|
+
try:
|
|
68
81
|
borg_archive = f"{backup_dir}::{archive_name}_{timestamp}"
|
|
69
82
|
logger.info(f"accuired lock {backup_dir}")
|
|
70
83
|
|
|
@@ -119,6 +132,9 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
119
132
|
if exit_code != 0:
|
|
120
133
|
raise Exception(f"Borg failed with code {exit_code}")
|
|
121
134
|
|
|
135
|
+
finally:
|
|
136
|
+
lock.release()
|
|
137
|
+
|
|
122
138
|
case Command.NAMESPACE_SECRETS:
|
|
123
139
|
# read meta dict size
|
|
124
140
|
dict_size = struct.unpack("!I", (await reader.readexactly(4)))[0]
|
|
@@ -39,10 +39,18 @@ async def archive_init(reader, writer, request_dict):
|
|
|
39
39
|
# wait for go signal, server needs to aquire write lock
|
|
40
40
|
# we dont
|
|
41
41
|
logger.debug("waiting for go from bdd")
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
while True:
|
|
43
|
+
signal = await reader.readexactly(1)
|
|
44
|
+
if signal == b"\x02":
|
|
45
|
+
logger.debug("waiting for lock continues...")
|
|
46
|
+
continue
|
|
47
|
+
|
|
48
|
+
if signal != b"\x01":
|
|
49
|
+
logger.error("recieved incorrect go signal")
|
|
50
|
+
raise Exception("Incorrect go signal!")
|
|
51
|
+
else:
|
|
52
|
+
break
|
|
53
|
+
|
|
46
54
|
logger.debug("received go")
|
|
47
55
|
|
|
48
56
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "3.5.3"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/brctl.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/funcs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/daemon/restore.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/ext_zfs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/funcs.py
RENAMED
|
File without changes
|
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/main.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/nextcloud.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/src/pve_cloud_backup/fetcher/patroni.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.3 → py_pve_cloud_backup-3.5.4}/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
|