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

fix: bypass system proxies for vSphere requests and improve VMDK disk filter matching logic

Browse Source
This commit is contained in:
Rizqi 2026-06-22 01:37:00 +07:00
parent 6b0894b407
commit b827865867
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backup_core.py
View File

@ -144,7 +144,7 @@ def download_datastore_file(host, dc_name, datastore_name, ds_path, local_path,
f"?dcPath={urllib.parse.quote(dc_name)}&dsName={urllib.parse.quote(datastore_name)}") f"?dcPath={urllib.parse.quote(dc_name)}&dsName={urllib.parse.quote(datastore_name)}")
headers = {"Cookie": f"vmware_soap_session={session_cookie}"} headers = {"Cookie": f"vmware_soap_session={session_cookie}"}
print(f"Downloading {ds_path} from datastore {datastore_name} to {local_path}") print(f"Downloading {ds_path} from datastore {datastore_name} to {local_path}")
with requests.get(url, headers=headers, stream=True, verify=verify_ssl) as r: with requests.get(url, headers=headers, stream=True, verify=verify_ssl, proxies={"http": None, "https": None}) as r:
r.raise_for_status() r.raise_for_status()
total_bytes = int(r.headers.get('Content-Length', 0)) total_bytes = int(r.headers.get('Content-Length', 0))
done_bytes = 0 done_bytes = 0
@ -319,9 +319,18 @@ def _run_backup_impl(host, user, password, vm_name, dest, compress, no_verify_ss
# 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:
disk_filter_set = set(disk_filter) def normalize_vmdk(path):
skipped = [r for r in vmdk_refs if r not in disk_filter_set] return re.sub(r'-\d+\.vmdk$', '.vmdk', path, flags=re.IGNORECASE)
vmdk_refs = [r for r in vmdk_refs if r in disk_filter_set]
disk_filter_normalized = {normalize_vmdk(f) for f in disk_filter}
new_vmdk_refs = []
skipped = []
for r in vmdk_refs:
if normalize_vmdk(r) in disk_filter_normalized:
new_vmdk_refs.append(r)
else:
skipped.append(r)
vmdk_refs = new_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:

2
vsphere_backup.py
View File

@ -101,7 +101,7 @@ def download_datastore_file(si, host, dc_name, datastore_name, ds_path, local_pa
url = f"https://{host}/folder/{encoded_path}?dcPath={urllib.parse.quote(dc_name)}&dsName={urllib.parse.quote(datastore_name)}" url = f"https://{host}/folder/{encoded_path}?dcPath={urllib.parse.quote(dc_name)}&dsName={urllib.parse.quote(datastore_name)}"
headers = {"Cookie": f"vmware_soap_session={session_cookie}"} headers = {"Cookie": f"vmware_soap_session={session_cookie}"}
print(f"Downloading {ds_path} from datastore {datastore_name} to {local_path}") print(f"Downloading {ds_path} from datastore {datastore_name} to {local_path}")
with requests.get(url, headers=headers, stream=True, verify=verify_ssl) as r: with requests.get(url, headers=headers, stream=True, verify=verify_ssl, proxies={"http": None, "https": None}) as r:
r.raise_for_status() r.raise_for_status()
os.makedirs(os.path.dirname(local_path), exist_ok=True) os.makedirs(os.path.dirname(local_path), exist_ok=True)
with open(local_path, 'wb') as f: with open(local_path, 'wb') as f: