rizqiv2/vSphere-Backup-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: normalize VMDK paths by stripping snapshot suffixes to ensure consistent base disk selection during backup

Browse Source
This commit is contained in:
Rizqi 2026-06-22 01:39:20 +07:00
parent b827865867
commit 2b5514f4c2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backup_core.py
View File

@ -314,23 +314,23 @@ def _run_backup_impl(host, user, password, vm_name, dest, compress, no_verify_ss
if not session_cookie: if not session_cookie:
raise Exception('Could not extract session cookie for downloads') raise Exception('Could not extract session cookie for downloads')
vmdk_refs = vm_disk_vmdk_paths(vm) # Get VMDK paths and normalize them (strip snapshot suffixes like -000001)
# so we always request the base VMDKs which vCenter streams as the full data disk
raw_vmdk_refs = vm_disk_vmdk_paths(vm)
vmdk_refs = [re.sub(r'-\d+\.vmdk$', '.vmdk', r, flags=re.IGNORECASE) for r in raw_vmdk_refs]
vmx_ref = vm_config_vmx_path(vm) vmx_ref = vm_config_vmx_path(vm)
# Apply disk filter — only download selected VMDKs # Apply disk filter — only download selected VMDKs
if disk_filter is not None: if disk_filter is not None:
def normalize_vmdk(path): disk_filter_set = {re.sub(r'-\d+\.vmdk$', '.vmdk', f, flags=re.IGNORECASE) for f in disk_filter}
return re.sub(r'-\d+\.vmdk$', '.vmdk', path, flags=re.IGNORECASE)
disk_filter_normalized = {normalize_vmdk(f) for f in disk_filter}
new_vmdk_refs = []
skipped = [] skipped = []
for r in vmdk_refs: filtered_vmdk_refs = []
if normalize_vmdk(r) in disk_filter_normalized: for raw_ref, norm_ref in zip(raw_vmdk_refs, vmdk_refs):
new_vmdk_refs.append(r) if norm_ref in disk_filter_set:
filtered_vmdk_refs.append(norm_ref)
else: else:
skipped.append(r) skipped.append(raw_ref)
vmdk_refs = new_vmdk_refs vmdk_refs = filtered_vmdk_refs
if skipped: if skipped:
print(f"Skipping {len(skipped)} disk(s) per disk_filter: {skipped}") print(f"Skipping {len(skipped)} disk(s) per disk_filter: {skipped}")
if not vmdk_refs: if not vmdk_refs: