Skip to content

Commit f50b383

Browse files
committed
fix(blktap2.py): change chain check position to be after lvchange lock
Signed-off-by: Damien Thenot <[email protected]>
1 parent 400b6b7 commit f50b383

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/blktap2.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,8 +1773,6 @@ def _activate_locked(self, sr_uuid, vdi_uuid, options):
17731773

17741774
vdi_type = self.target.get_vdi_type()
17751775

1776-
self._check_journal_coalesce_chain(sr_uuid, vdi_uuid)
1777-
#TODO: handling error here
17781776

17791777
# Take lvchange-p Lock before running
17801778
# tap-ctl open
@@ -1787,6 +1785,9 @@ def _activate_locked(self, sr_uuid, vdi_uuid, options):
17871785
lock = Lock("lvchange-p", NS_PREFIX_LVM + sr_uuid)
17881786
lock.acquire()
17891787

1788+
self._check_journal_coalesce_chain(sr_uuid, vdi_uuid)
1789+
#TODO: handling error here
1790+
17901791
# When we attach a static VDI for HA, we cannot communicate with
17911792
# xapi, because has not started yet. These VDIs are raw.
17921793
if VdiType.isCowImage(vdi_type):

0 commit comments

Comments
 (0)