From 545ee229cff81682af0225520935c90f5a840dc3 Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Sat, 16 Dec 2023 18:13:42 +0000 Subject: [PATCH] (t) replication spawn error #2766 Modernise previously missed replication imports re Py3.* --- .../smart_manager/replication/listener_broker.py | 10 +++++----- src/rockstor/smart_manager/replication/receiver.py | 7 +++---- src/rockstor/smart_manager/replication/sender.py | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/rockstor/smart_manager/replication/listener_broker.py b/src/rockstor/smart_manager/replication/listener_broker.py index 4e2043927..cf1d74dd5 100644 --- a/src/rockstor/smart_manager/replication/listener_broker.py +++ b/src/rockstor/smart_manager/replication/listener_broker.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2012-2020 RockStor, Inc. +Copyright (c) 2012-2023 RockStor, Inc. This file is part of RockStor. RockStor is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program. If not, see . """ from multiprocessing import Process @@ -24,9 +24,9 @@ from storageadmin.models import NetworkConnection, Appliance from smart_manager.models import ReplicaTrail, ReplicaShare, Replica, Service from django.conf import settings -from sender import Sender -from receiver import Receiver -from util import ReplicationMixin +from smart_manager.replication.sender import Sender +from smart_manager.replication.receiver import Receiver +from smart_manager.replication.util import ReplicationMixin from cli import APIWrapper import logging diff --git a/src/rockstor/smart_manager/replication/receiver.py b/src/rockstor/smart_manager/replication/receiver.py index fb684933b..74427ec6c 100644 --- a/src/rockstor/smart_manager/replication/receiver.py +++ b/src/rockstor/smart_manager/replication/receiver.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2012-2020 RockStor, Inc. +Copyright (c) 2012-2023 RockStor, Inc. This file is part of RockStor. RockStor is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program. If not, see . """ from multiprocessing import Process @@ -26,12 +26,11 @@ from django.conf import settings from django import db from contextlib import contextmanager -from util import ReplicationMixin +from smart_manager.replication.util import ReplicationMixin from fs.btrfs import get_oldest_snap, remove_share, set_property, is_subvol, mount_share from system.osi import run_command from storageadmin.models import Pool, Share, Appliance from smart_manager.models import ReplicaShare, ReceiveTrail -import shutil from cli import APIWrapper import logging diff --git a/src/rockstor/smart_manager/replication/sender.py b/src/rockstor/smart_manager/replication/sender.py index 41c8b0fa9..9f78bc28a 100644 --- a/src/rockstor/smart_manager/replication/sender.py +++ b/src/rockstor/smart_manager/replication/sender.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2012-2020 RockStor, Inc. +Copyright (c) 2012-2023 RockStor, Inc. This file is part of RockStor. RockStor is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program. If not, see . """ from multiprocessing import Process @@ -26,7 +26,7 @@ import time from django.conf import settings from contextlib import contextmanager -from util import ReplicationMixin +from smart_manager.replication.util import ReplicationMixin from fs.btrfs import get_oldest_snap, is_subvol from smart_manager.models import ReplicaTrail from cli import APIWrapper