Skip to content

Fix GC hidden attribute in case of SIGTERM signal #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
Merged

Fix GC hidden attribute in case of SIGTERM signal #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 29 additions & 21 deletions drivers/cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ def __init__(self, sr, uuid, raw):
self.sizeVirt = -1
self._sizeVHD = -1
self._sizeAllocated = -1
self.hidden = False
self._hidden = False
self.parent = None
self.children = []
self._vdiRef = None
Expand Down Expand Up @@ -664,15 +664,15 @@ def isCoalesceable(self):
return not self.scanError and \
self.parent and \
len(self.parent.children) == 1 and \
self.hidden and \
self.isHidden() and \
len(self.children) > 0

def isLeafCoalesceable(self):
"""A VDI is leaf-coalesceable if it has no siblings and is a leaf"""
return not self.scanError and \
self.parent and \
len(self.parent.children) == 1 and \
not self.hidden and \
not self.isHidden() and \
len(self.children) == 0

def canLiveCoalesce(self, speed):
Expand Down Expand Up @@ -700,7 +700,7 @@ def getAllPrunable(self):
# some tapdisks could still be using the file.
if self.sr.journaler.get(self.JRN_RELINK, self.uuid):
return []
if not self.scanError and self.hidden:
if not self.scanError and self.isHidden():
return [self]
return []

Expand All @@ -724,7 +724,7 @@ def getAllPrunable(self):
# Normally we are not in this function when the delete action is
# executed but in `_liveLeafCoalesce`.

if not self.scanError and not self.hidden and thisPrunable:
if not self.scanError and not self.isHidden() and thisPrunable:
vdiList.append(self)
return vdiList

Expand Down Expand Up @@ -795,7 +795,7 @@ def repair(self, parent) -> None:
@override
def __str__(self) -> str:
strHidden = ""
if self.hidden:
if self.isHidden():
strHidden = "*"
strSizeVirt = "?"
if self.sizeVirt > 0:
Expand Down Expand Up @@ -1055,13 +1055,19 @@ def _setParent(self, parent) -> None:
Util.log("Failed to update %s with vhd-parent field %s" % \
(self.uuid, self.parentUuid))

def isHidden(self) -> bool:
if self._hidden is None:
self._loadInfoHidden()
return self._hidden

def _loadInfoHidden(self) -> None:
hidden = vhdutil.getHidden(self.path)
self.hidden = (hidden != 0)
self._hidden = (hidden != 0)

def _setHidden(self, hidden=True) -> None:
self._hidden = None
vhdutil.setHidden(self.path, hidden)
self.hidden = hidden
self._hidden = hidden

def _increaseSizeVirt(self, size, atomic=True) -> None:
"""ensure the virtual size of 'self' is at least 'size'. Note that
Expand Down Expand Up @@ -1186,7 +1192,7 @@ def load(self, info=None) -> None:
self.sizeVirt = info.sizeVirt
self._sizeVHD = info.sizePhys
self._sizeAllocated = info.sizeAllocated
self.hidden = info.hidden
self._hidden = info.hidden
self.scanError = False
self.path = os.path.join(self.sr.path, "%s%s" % \
(self.uuid, vhdutil.FILE_EXTN_VHD))
Expand Down Expand Up @@ -1245,7 +1251,7 @@ def load(self, info=None) -> None:
self.lvActive = info.lvActive
self.lvOpen = info.lvOpen
self.lvReadonly = info.lvReadonly
self.hidden = info.hidden
self._hidden = info.hidden
self.parentUuid = info.parentUuid
self.path = os.path.join(self.sr.path, self.fileName)

Expand Down Expand Up @@ -1379,15 +1385,16 @@ def _loadInfoSizeAllocated(self):
@override
def _loadInfoHidden(self) -> None:
if self.raw:
self.hidden = self.sr.lvmCache.getHidden(self.fileName)
self._hidden = self.sr.lvmCache.getHidden(self.fileName)
else:
VDI._loadInfoHidden(self)

@override
def _setHidden(self, hidden=True) -> None:
if self.raw:
self._hidden = None
self.sr.lvmCache.setHidden(self.fileName, hidden)
self.hidden = hidden
self._hidden = hidden
else:
VDI._setHidden(self, hidden)

Expand All @@ -1397,7 +1404,7 @@ def __str__(self) -> str:
if self.raw:
strType = "RAW"
strHidden = ""
if self.hidden:
if self.isHidden():
strHidden = "*"
strSizeVHD = ""
if self._sizeVHD > 0:
Expand Down Expand Up @@ -1575,7 +1582,7 @@ def load(self, info=None) -> None:
self._sizeVHD = -1
self._sizeAllocated = -1
self.drbd_size = -1
self.hidden = info.hidden
self._hidden = info.hidden
self.scanError = False
self.vdi_type = vhdutil.VDI_TYPE_VHD

Expand Down Expand Up @@ -1749,10 +1756,11 @@ def _setHidden(self, hidden=True) -> None:
HIDDEN_TAG = 'hidden'

if self.raw:
self._hidden = None
self.sr._linstor.update_volume_metadata(self.uuid, {
HIDDEN_TAG: hidden
})
self.hidden = hidden
self._hidden = hidden
else:
VDI._setHidden(self, hidden)

Expand Down Expand Up @@ -3013,9 +3021,9 @@ def _undoInterruptedCoalesceLeaf(self, childUuid, parentUuid):
child.setConfig(VDI.DB_VDI_TYPE, vhdutil.VDI_TYPE_VHD)
util.fistpoint.activate("LVHDRT_coaleaf_undo_after_rename2", self.uuid)

if child.hidden:
if child.isHidden():
child._setHidden(False)
if not parent.hidden:
if not parent.isHidden():
parent._setHidden(True)
self._updateSlavesOnUndoLeafCoalesce(parent, child)
util.fistpoint.activate("LVHDRT_coaleaf_undo_end", self.uuid)
Expand Down Expand Up @@ -3247,9 +3255,9 @@ def _undoInterruptedCoalesceLeaf(self, childUuid, parentUuid):
parent.deflate()
child.inflateFully()
util.fistpoint.activate("LVHDRT_coaleaf_undo_after_deflate", self.uuid)
if child.hidden:
if child.isHidden():
child._setHidden(False)
if not parent.hidden:
if not parent.isHidden():
parent._setHidden(True)
if not parent.lvReadonly:
self.lvmCache.setReadonly(parent.fileName, True)
Expand Down Expand Up @@ -3603,9 +3611,9 @@ def _undoInterruptedCoalesceLeaf(self, childUuid, parentUuid):

# TODO: Maybe deflate here.

if child.hidden:
if child.isHidden():
child._setHidden(False)
if not parent.hidden:
if not parent.isHidden():
parent._setHidden(True)
self._updateSlavesOnUndoLeafCoalesce(parent, child)
Util.log('*** leaf-coalesce undo successful')
Expand Down