aboutsummaryrefslogtreecommitdiffstats
path: root/autoBackup
diff options
context:
space:
mode:
authorjwansek <eddie.atten.ea29@gmail.com>2025-12-09 16:18:43 +0000
committerjwansek <eddie.atten.ea29@gmail.com>2025-12-09 16:18:43 +0000
commita6cfeef5ee733779529abb36f7595acb6bd3f586 (patch)
treea2208677302c9f89e85214cb045185e747f8785f /autoBackup
parent368a8abb3156716c91e9e8989c089ad75c4e56aa (diff)
downloadBetterZFSReplication-a6cfeef5ee733779529abb36f7595acb6bd3f586.tar.gz
BetterZFSReplication-a6cfeef5ee733779529abb36f7595acb6bd3f586.zip
Switched the master TrueNAS to use the sockets APIHEADmaster
Diffstat (limited to 'autoBackup')
-rw-r--r--autoBackup/autoBackup.py51
1 files changed, 29 insertions, 22 deletions
diff --git a/autoBackup/autoBackup.py b/autoBackup/autoBackup.py
index 9d1a3f1..7f1bc76 100644
--- a/autoBackup/autoBackup.py
+++ b/autoBackup/autoBackup.py
@@ -289,18 +289,13 @@ def main():
subprocess.run(["rm", "-f", os.path.join(os.path.dirname(__file__), "*_replication_jobs.pickle")])
if os.environ["MASTER_REPLICATION_TASKS"] != "":
- tasks = os.environ["MASTER_REPLICATION_TASKS"].split(",")
+ master_tasks = os.environ["MASTER_REPLICATION_TASKS"].split(",")
else:
- tasks = []
- master = TrueNASAPIClient(
- host = os.environ["MASTER_HOST"],
- api_key = os.environ["MASTER_KEY"],
- replication_task_names = tasks
- )
+ master_tasks = []
if os.environ["SLAVE_REPLICATION_TASKS"] != "":
- tasks = os.environ["SLAVE_REPLICATION_TASKS"].split(",")
+ slave_tasks = os.environ["SLAVE_REPLICATION_TASKS"].split(",")
else:
- tasks = []
+ slave_tasks = []
logging.info("\n\nBegan autoBackup procedure")
m = get_mqtt()
@@ -314,22 +309,34 @@ def main():
# wait_for_slave(slave)
wait_for_sockets_slave()
- with TrueNASWebsocketsClient(
- host = os.environ["SLAVE_HOST"],
- username = os.environ["SLAVE_USERNAME"],
- password = os.environ["SLAVE_PASSWORD"],
- replication_task_names = tasks
- ) as slave:
+ with (TrueNASWebsocketsClient(
+ host = os.environ["SLAVE_HOST"],
+ username = os.environ["SLAVE_USERNAME"],
+ password = os.environ["SLAVE_PASSWORD"],
+ replication_task_names = slave_tasks
+ ) as slave, TrueNASWebsocketsClient(
+ host = os.environ["MASTER_HOST"],
+ username = os.environ["MASTER_USERNAME"],
+ password = os.environ["MASTER_PASSWORD"],
+ replication_task_names = master_tasks
+ ) as master
+ ):
master.run_all_replication_tasks()
slave.run_all_replication_tasks()
while True:
- with TrueNASWebsocketsClient(
- host = os.environ["SLAVE_HOST"],
- username = os.environ["SLAVE_USERNAME"],
- password = os.environ["SLAVE_PASSWORD"],
- replication_task_names = tasks
- ) as slave:
+ with (TrueNASWebsocketsClient(
+ host = os.environ["SLAVE_HOST"],
+ username = os.environ["SLAVE_USERNAME"],
+ password = os.environ["SLAVE_PASSWORD"],
+ replication_task_names = slave_tasks
+ ) as slave, TrueNASWebsocketsClient(
+ host = os.environ["MASTER_HOST"],
+ username = os.environ["MASTER_USERNAME"],
+ password = os.environ["MASTER_PASSWORD"],
+ replication_task_names = master_tasks
+ ) as master
+ ):
if check_if_all_complete([master, slave]):
break
@@ -346,7 +353,7 @@ def main():
host = os.environ["SLAVE_HOST"],
username = os.environ["SLAVE_USERNAME"],
password = os.environ["SLAVE_PASSWORD"],
- replication_task_names = tasks
+ replication_task_names = slave_tasks
) as slave:
slave.shutdown()
# logging.info(json.dumps(slave.shutdown(), indent = 4))