Revision 5b4cd1b0 lib/config.py
b/lib/config.py | ||
---|---|---|
93 | 93 |
|
94 | 94 |
""" |
95 | 95 |
self._OpenConfig() |
96 |
self._ReleaseLock() |
|
97 | 96 |
prefix = self._config_data.cluster.mac_prefix |
98 | 97 |
all_macs = self._AllMACs() |
99 | 98 |
retries = 64 |
... | ... | |
117 | 116 |
|
118 | 117 |
""" |
119 | 118 |
self._OpenConfig() |
120 |
self._ReleaseLock() |
|
121 | 119 |
all_macs = self._AllMACs() |
122 | 120 |
return mac in all_macs |
123 | 121 |
|
... | ... | |
126 | 124 |
|
127 | 125 |
""" |
128 | 126 |
self._OpenConfig() |
129 |
self._ReleaseLock() |
|
130 | 127 |
lvnames = set() |
131 | 128 |
for instance in self._config_data.instances.values(): |
132 | 129 |
node_data = instance.MapLVsByNode() |
... | ... | |
172 | 169 |
|
173 | 170 |
""" |
174 | 171 |
self._OpenConfig() |
175 |
self._ReleaseLock() |
|
176 | 172 |
|
177 | 173 |
result = [] |
178 | 174 |
for instance in self._config_data.instances.values(): |
... | ... | |
185 | 181 |
"""Stub verify function. |
186 | 182 |
""" |
187 | 183 |
self._OpenConfig() |
188 |
self._ReleaseLock() |
|
189 | 184 |
|
190 | 185 |
result = [] |
191 | 186 |
seen_macs = [] |
... | ... | |
259 | 254 |
|
260 | 255 |
""" |
261 | 256 |
self._OpenConfig() |
262 |
self._ReleaseLock() |
|
263 | 257 |
return self._config_data.cluster.tcpudp_port_pool.copy() |
264 | 258 |
|
265 | 259 |
def AllocatePort(self): |
... | ... | |
294 | 288 |
Returns: rsa hostkey |
295 | 289 |
""" |
296 | 290 |
self._OpenConfig() |
297 |
self._ReleaseLock() |
|
298 | 291 |
return self._config_data.cluster.rsahostkeypub |
299 | 292 |
|
300 | 293 |
def AddInstance(self, instance): |
... | ... | |
393 | 386 |
|
394 | 387 |
""" |
395 | 388 |
self._OpenConfig() |
396 |
self._ReleaseLock() |
|
397 | 389 |
|
398 | 390 |
return self._config_data.instances.keys() |
399 | 391 |
|
... | ... | |
402 | 394 |
|
403 | 395 |
""" |
404 | 396 |
self._OpenConfig() |
405 |
self._ReleaseLock() |
|
406 | 397 |
|
407 | 398 |
return utils.MatchNameComponent(short_name, |
408 | 399 |
self._config_data.instances.keys()) |
... | ... | |
421 | 412 |
|
422 | 413 |
""" |
423 | 414 |
self._OpenConfig() |
424 |
self._ReleaseLock() |
|
425 | 415 |
|
426 | 416 |
if instance_name not in self._config_data.instances: |
427 | 417 |
return None |
... | ... | |
455 | 445 |
|
456 | 446 |
""" |
457 | 447 |
self._OpenConfig() |
458 |
self._ReleaseLock() |
|
459 | 448 |
|
460 | 449 |
return utils.MatchNameComponent(short_name, |
461 | 450 |
self._config_data.nodes.keys()) |
... | ... | |
469 | 458 |
|
470 | 459 |
""" |
471 | 460 |
self._OpenConfig() |
472 |
self._ReleaseLock() |
|
473 | 461 |
|
474 | 462 |
if node_name not in self._config_data.nodes: |
475 | 463 |
return None |
... | ... | |
481 | 469 |
|
482 | 470 |
""" |
483 | 471 |
self._OpenConfig() |
484 |
self._ReleaseLock() |
|
485 | 472 |
return self._config_data.nodes.keys() |
486 | 473 |
|
487 | 474 |
def DumpConfig(self): |
488 | 475 |
"""Return the entire configuration of the cluster. |
489 | 476 |
""" |
490 | 477 |
self._OpenConfig() |
491 |
self._ReleaseLock() |
|
492 | 478 |
return self._config_data |
493 | 479 |
|
494 | 480 |
def _BumpSerialNo(self): |
... | ... | |
537 | 523 |
self._config_size = st.st_size |
538 | 524 |
self._config_inode = st.st_ino |
539 | 525 |
|
540 |
def _ReleaseLock(self): |
|
541 |
"""xxxx |
|
542 |
""" |
|
543 |
|
|
544 | 526 |
def _DistributeConfig(self): |
545 | 527 |
"""Distribute the configuration to the other nodes. |
546 | 528 |
|
... | ... | |
634 | 616 |
|
635 | 617 |
""" |
636 | 618 |
self._OpenConfig() |
637 |
self._ReleaseLock() |
|
638 | 619 |
return self._config_data.cluster.volume_group_name |
639 | 620 |
|
640 | 621 |
def SetVGName(self, vg_name): |
... | ... | |
650 | 631 |
|
651 | 632 |
""" |
652 | 633 |
self._OpenConfig() |
653 |
self._ReleaseLock() |
|
654 | 634 |
return self._config_data.cluster.default_bridge |
655 | 635 |
|
656 | 636 |
def GetMACPrefix(self): |
... | ... | |
658 | 638 |
|
659 | 639 |
""" |
660 | 640 |
self._OpenConfig() |
661 |
self._ReleaseLock() |
|
662 | 641 |
return self._config_data.cluster.mac_prefix |
663 | 642 |
|
664 | 643 |
def GetClusterInfo(self): |
... | ... | |
669 | 648 |
|
670 | 649 |
""" |
671 | 650 |
self._OpenConfig() |
672 |
self._ReleaseLock() |
|
673 | 651 |
|
674 | 652 |
return self._config_data.cluster |
675 | 653 |
|
Also available in: Unified diff