Revision 67d101d4
| b/lib/bdev.py | ||
|---|---|---|
| 770 | 770 |
results = {}
|
| 771 | 771 |
old_minor = old_line = None |
| 772 | 772 |
for line in data: |
| 773 |
if not line: # completely empty lines, as can be returned by drbd8.0+ |
|
| 774 |
continue |
|
| 773 | 775 |
lresult = lmatch.match(line) |
| 774 | 776 |
if lresult is not None: |
| 775 | 777 |
if old_minor is not None: |
| b/test/data/proc_drbd80-emptyline.txt | ||
|---|---|---|
| 1 |
GIT-hash: 5c9f89594553e32adb87d9638dce591782f947e3 build by root@node1.example.com, 2009-05-22 12:47:52 |
|
| 2 |
0: cs:Connected st:Primary/Secondary ds:UpToDate/UpToDate C r--- |
|
| 3 |
ns:78728316 nr:0 dw:77675644 dr:1277039 al:254 bm:270 lo:0 pe:0 ua:0 ap:0 |
|
| 4 |
resync: used:0/61 hits:65657 misses:135 starving:0 dirty:0 changed:135 |
|
| 5 |
act_log: used:0/257 hits:11378843 misses:254 starving:0 dirty:0 changed:254 |
|
| 6 |
1: cs:Unconfigured |
|
| 7 |
2: cs:Unconfigured |
|
| 8 |
|
|
| 9 |
5: cs:Unconfigured |
|
| 10 |
6: cs:Unconfigured |
|
| b/test/ganeti.bdev_unittest.py | ||
|---|---|---|
| 114 | 114 |
"""Read in txt data""" |
| 115 | 115 |
testutils.GanetiTestCase.setUp(self) |
| 116 | 116 |
proc_data = self._TestDataFilename("proc_drbd8.txt")
|
| 117 |
proc80e_data = self._TestDataFilename("proc_drbd80-emptyline.txt")
|
|
| 117 | 118 |
proc83_data = self._TestDataFilename("proc_drbd83.txt")
|
| 118 | 119 |
self.proc_data = bdev.DRBD8._GetProcData(filename=proc_data) |
| 120 |
self.proc80e_data = bdev.DRBD8._GetProcData(filename=proc80e_data) |
|
| 119 | 121 |
self.proc83_data = bdev.DRBD8._GetProcData(filename=proc83_data) |
| 120 | 122 |
self.mass_data = bdev.DRBD8._MassageProcData(self.proc_data) |
| 123 |
self.mass80e_data = bdev.DRBD8._MassageProcData(self.proc80e_data) |
|
| 121 | 124 |
self.mass83_data = bdev.DRBD8._MassageProcData(self.proc83_data) |
| 122 | 125 |
|
| 123 | 126 |
def testIOErrors(self): |
| ... | ... | |
| 131 | 134 |
"""Test not-found-minor in /proc""" |
| 132 | 135 |
self.failUnless(9 not in self.mass_data) |
| 133 | 136 |
self.failUnless(9 not in self.mass83_data) |
| 137 |
self.failUnless(3 not in self.mass80e_data) |
|
| 134 | 138 |
|
| 135 | 139 |
def testLineNotMatch(self): |
| 136 | 140 |
"""Test wrong line passed to DRBD8Status""" |
| ... | ... | |
| 154 | 158 |
|
| 155 | 159 |
def testMinor2(self): |
| 156 | 160 |
"""Test unconfigured device""" |
| 157 |
for data in [self.mass_data, self.mass83_data]: |
|
| 161 |
for data in [self.mass_data, self.mass83_data, self.mass80e_data]:
|
|
| 158 | 162 |
stats = bdev.DRBD8Status(data[2]) |
| 159 | 163 |
self.failIf(stats.is_in_use) |
| 160 | 164 |
|
Also available in: Unified diff