Revision 38396ae2
b/lib/block/drbd.py | ||
---|---|---|
81 | 81 |
return data |
82 | 82 |
|
83 | 83 |
@classmethod |
84 |
def _MassageProcData(cls, data):
|
|
84 |
def _JoinProcDataPerMinor(cls, data):
|
|
85 | 85 |
"""Transform the output of _GetProdData into a nicer form. |
86 | 86 |
|
87 | 87 |
@return: a dictionary of minor: joined lines from /proc/drbd |
... | ... | |
944 | 944 |
if self.minor is None: |
945 | 945 |
base.ThrowError("drbd%d: GetStats() called while not attached", |
946 | 946 |
self._aminor) |
947 |
proc_info = self._MassageProcData(self._GetProcData())
|
|
947 |
proc_info = self._JoinProcDataPerMinor(self._GetProcData())
|
|
948 | 948 |
if self.minor not in proc_info: |
949 | 949 |
base.ThrowError("drbd%d: can't find myself in /proc", self.minor) |
950 | 950 |
return DRBD8Status(proc_info[self.minor]) |
... | ... | |
1319 | 1319 |
" exclusive_storage") |
1320 | 1320 |
# check that the minor is unused |
1321 | 1321 |
aminor = unique_id[4] |
1322 |
proc_info = cls._MassageProcData(cls._GetProcData())
|
|
1322 |
proc_info = cls._JoinProcDataPerMinor(cls._GetProcData())
|
|
1323 | 1323 |
if aminor in proc_info: |
1324 | 1324 |
status = DRBD8Status(proc_info[aminor]) |
1325 | 1325 |
in_use = status.is_in_use |
b/test/py/ganeti.block.bdev_unittest.py | ||
---|---|---|
250 | 250 |
self.proc83_sync_data = drbd.DRBD8._GetProcData(filename=proc83_sync_data) |
251 | 251 |
self.proc83_sync_krnl_data = \ |
252 | 252 |
drbd.DRBD8._GetProcData(filename=proc83_sync_krnl_data) |
253 |
self.mass_data = drbd.DRBD8._MassageProcData(self.proc_data) |
|
254 |
self.mass80e_data = drbd.DRBD8._MassageProcData(self.proc80e_data) |
|
255 |
self.mass83_data = drbd.DRBD8._MassageProcData(self.proc83_data) |
|
256 |
self.mass83_sync_data = drbd.DRBD8._MassageProcData(self.proc83_sync_data) |
|
253 |
self.mass_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc_data) |
|
254 |
self.mass80e_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc80e_data) |
|
255 |
self.mass83_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc83_data) |
|
256 |
self.mass83_sync_data = \ |
|
257 |
drbd.DRBD8._JoinProcDataPerMinor(self.proc83_sync_data) |
|
257 | 258 |
self.mass83_sync_krnl_data = \ |
258 |
drbd.DRBD8._MassageProcData(self.proc83_sync_krnl_data)
|
|
259 |
drbd.DRBD8._JoinProcDataPerMinor(self.proc83_sync_krnl_data)
|
|
259 | 260 |
|
260 | 261 |
def testIOErrors(self): |
261 | 262 |
"""Test handling of errors while reading the proc file.""" |
Also available in: Unified diff