starlingx/update
Code Issues Proposed changes

Merge "Add logs for LVM feature."

Browse Source
This commit is contained in:
Zuul
2025-11-25 15:55:25 +00:00
committed by Gerrit Code Review
parent 4da34f1ca7 cb015b3fd7
commit 56b16226cb
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
software/software/agent_hooks.py
View File

@@ -721,6 +721,7 @@ class UpdateGrubConfigHook(BaseHook):
"--set-boot-variable",
f"system_mode={system_mode}",
]
LOG.info("Executing command: %s", cmd)
subprocess.run(cmd, check=True, text=True, capture_output=True)
except subprocess.CalledProcessError as e:
LOG.error("Failed to update system_mode in boot.env: %s", e.stderr)

13
software/software/lvm_snapshot.py
View File

@@ -38,6 +38,8 @@ class LVMSnapshot:
self._lv_name = lv_name
self._lv_size = lv_size
self._name = f"{lv_name}_snapshot"
self.lvm_log_file = "/var/log/lvm_snapshot.log"
self._log_config = f'log {{ report_command_log=1 level=7 verbose=1 file="{self.lvm_log_file}" overwrite=0 }}'
@property
def lv_name(self):
@@ -60,6 +62,7 @@ class LVMSnapshot:
:param check: if subprocess.CalledProcessError must be raised when rc != 0
"""
try:
LOG.info("Executing command: %s" % command)
result = subprocess.run(command, shell=shell, check=check,
text=True, capture_output=True)
return result
@@ -117,23 +120,23 @@ class LVMSnapshot:
"""
Run the command to create a snapshot
"""
command = [self.get_command_abs_path("lvcreate"), "-y", "-L", self._lv_size, "-s", "-n",
self._name, Path("/dev") / self._vg_name / self._lv_name]
command = [self.get_command_abs_path("lvcreate"), "--config", self._log_config, "-y", "-L",
self._lv_size, "-s", "-n", self._name, Path("/dev") / self._vg_name / self._lv_name]
self.run_command(command)
def restore(self):
"""
Run the command to restore a snapshot
"""
command = [self.get_command_abs_path("lvconvert"), "-y", "--merge",
Path("/dev") / self._vg_name / self._name]
command = [self.get_command_abs_path("lvconvert"), "--config", self._log_config,
"-y", "--merge", Path("/dev") / self._vg_name / self._name]
self.run_command(command)
def delete(self):
"""
Run the command to delete a snapshot
"""
command = [self.get_command_abs_path("lvremove"), "-f",
command = [self.get_command_abs_path("lvremove"), "--config", self._log_config, "-f",
Path("/dev") / self._vg_name / self._name]
self.run_command(command)

1
software/software/ostree_utils.py
View File

@@ -290,6 +290,7 @@ def pull_ostree_from_remote(remote=None):
ref_cmd = "ostree refs --force --create=%s %s" % (ref, constants.OSTREE_REF)
try:
LOG.info("Executing ostree pull command: %s" % cmd)
process = subprocess.run(cmd % ref, shell=True, check=True, text=True, capture_output=True)
except subprocess.CalledProcessError as e:
msg = "Failed to pull from %s remote into sysroot ostree" % ref