Skip to content

Commit 29a77c2

Browse files
committed
refactor: remove unused lvol mutation lock functions from snapshot controller
1 parent 74d097d commit 29a77c2

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

simplyblock_core/controllers/snapshot_controller.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,6 @@
2121
db_controller = DBController()
2222

2323

24-
def _acquire_lvol_mutation_lock(node):
25-
"""Block concurrent lvstore mutations while HA registration is in flight."""
26-
had_lock = node.lvol_sync_del()
27-
if not had_lock:
28-
node.lvol_del_sync_lock()
29-
return had_lock
30-
31-
32-
def _release_lvol_mutation_lock(node, had_lock):
33-
if not had_lock:
34-
node.lvol_del_sync_lock_reset()
35-
36-
37-
def _rollback_lvol_creation(lvol, node_ids):
38-
for node_id in dict.fromkeys(node_ids):
39-
try:
40-
lvol_controller.delete_lvol_from_node(lvol.get_id(), node_id)
41-
except Exception as e:
42-
logger.error(f"Failed to rollback lvol {lvol.get_id()} from node {node_id}: {e}")
43-
44-
4524
def add(lvol_id, snapshot_name, backup=False, lock=True):
4625
try:
4726
lvol = db_controller.get_lvol_by_id(lvol_id)
@@ -191,10 +170,6 @@ def add(lvol_id, snapshot_name, backup=False, lock=True):
191170
except KeyError:
192171
pass
193172

194-
had_lock = False
195-
if lock:
196-
had_lock = _acquire_lvol_mutation_lock(host_node)
197-
198173
if primary_node:
199174
rpc_client = RPCClient(
200175
primary_node.mgmt_ip, primary_node.rpc_port, primary_node.rpc_username, primary_node.rpc_password)
@@ -231,8 +206,6 @@ def add(lvol_id, snapshot_name, backup=False, lock=True):
231206
logger.error(f"Failed to delete snap from node: {snode.get_id()}")
232207
return False, msg
233208

234-
if lock:
235-
_release_lvol_mutation_lock(host_node, had_lock)
236209

237210
snap = SnapShot()
238211
snap.uuid = str(uuid.uuid4())
@@ -710,10 +683,6 @@ def clone(snapshot_id, clone_name, new_size=0, pvc_name=None, pvc_namespace=None
710683
except KeyError:
711684
pass
712685

713-
had_lock = False
714-
if lock:
715-
had_lock = _acquire_lvol_mutation_lock(host_node)
716-
717686
if primary_node:
718687
lvol_bdev, error = lvol_controller.add_lvol_on_node(lvol, primary_node)
719688
if error:
@@ -730,8 +699,6 @@ def clone(snapshot_id, clone_name, new_size=0, pvc_name=None, pvc_namespace=None
730699
logger.error(error)
731700
lvol.remove(db_controller.kv_store)
732701
return False, error
733-
if lock and had_lock:
734-
_release_lvol_mutation_lock(host_node, had_lock)
735702

736703
lvol.status = LVol.STATUS_ONLINE
737704
lvol.write_to_db(db_controller.kv_store)

0 commit comments

Comments
 (0)