Skip to content

Commit 05ae3db

Browse files
authored
Merge pull request ceph#61241 from guits/ceph-volume-69430
ceph-volume: fix Zap.ensure_associated_raw()
2 parents 8056c23 + 95bdcbf commit 05ae3db

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/ceph-volume/ceph_volume/devices/lvm/zap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,12 @@ def ensure_associated_raw(self, raw_report: Dict[str, Any]) -> List[str]:
119119
osd_uuid = details.get('osd_uuid')
120120
break
121121

122-
for osd_uuid, details in raw_report.items():
122+
for _, details in raw_report.items():
123123
device: str = details.get('device')
124124
if details.get('osd_uuid') == osd_uuid:
125125
raw_devices.add(device)
126126

127127
return list(raw_devices)
128-
129128

130129
def find_associated_devices(self) -> List[api.Volume]:
131130
"""From an ``osd_id`` and/or an ``osd_fsid``, filter out all the Logical Volumes (LVs) in the

src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"whoami": "0"
2323
},
2424
"/dev/vdx": {
25-
"osd_uuid": "d5a496bc-dcb9-4ad0-a12c-393d3200d2b6",
25+
"osd_uuid": "d5a496bc-dcb9-4ad0-a12c-393d3200d2b7",
2626
"size": 214748364800,
2727
"btime": "2024-10-16T10:51:05.955279+0000",
2828
"description": "main",

0 commit comments

Comments
 (0)