Revision a8efbb40 lib/config.py
b/lib/config.py | ||
---|---|---|
214 | 214 |
|
215 | 215 |
@locking.ssynchronized(_config_lock, shared=1) |
216 | 216 |
def VerifyConfig(self): |
217 |
"""Stub verify function. |
|
217 |
"""Verify function. |
|
218 |
|
|
218 | 219 |
""" |
219 | 220 |
result = [] |
220 | 221 |
seen_macs = [] |
... | ... | |
251 | 252 |
ports[net_port].append((instance.name, "network port")) |
252 | 253 |
|
253 | 254 |
# cluster-wide pool of free ports |
254 |
for free_port in self._config_data.cluster.tcpudp_port_pool:
|
|
255 |
for free_port in data.cluster.tcpudp_port_pool: |
|
255 | 256 |
if free_port not in ports: |
256 | 257 |
ports[free_port] = [] |
257 | 258 |
ports[free_port].append(("cluster", "port marked as free")) |
... | ... | |
267 | 268 |
|
268 | 269 |
# highest used tcp port check |
269 | 270 |
if keys: |
270 |
if keys[-1] > self._config_data.cluster.highest_used_port:
|
|
271 |
if keys[-1] > data.cluster.highest_used_port: |
|
271 | 272 |
result.append("Highest used port mismatch, saved %s, computed %s" % |
272 |
(self._config_data.cluster.highest_used_port, |
|
273 |
keys[-1])) |
|
273 |
(data.cluster.highest_used_port, keys[-1])) |
|
274 |
|
|
275 |
cp_size = data.cluster.candidate_pool_size |
|
276 |
num_c = 0 |
|
277 |
for node in data.nodes.values(): |
|
278 |
if node.master_candidate: |
|
279 |
num_c += 1 |
|
280 |
if cp_size > num_c: |
|
281 |
result.append("Not enough master candidates: actual %d, desired %d" % |
|
282 |
(num_c, cp_size)) |
|
274 | 283 |
|
275 | 284 |
return result |
276 | 285 |
|
Also available in: Unified diff