Revision a5ce2ea2 lib/server/masterd.py
b/lib/server/masterd.py | ||
---|---|---|
58 | 58 |
from ganeti import objects |
59 | 59 |
from ganeti import query |
60 | 60 |
from ganeti import runtime |
61 |
from ganeti import pathutils |
|
61 | 62 |
|
62 | 63 |
|
63 | 64 |
CLIENT_REQUEST_WORKERS = 16 |
... | ... | |
527 | 528 |
|
528 | 529 |
""" |
529 | 530 |
if until is None: |
530 |
utils.RemoveFile(constants.WATCHER_PAUSEFILE)
|
|
531 |
utils.RemoveFile(pathutils.WATCHER_PAUSEFILE)
|
|
531 | 532 |
else: |
532 |
utils.WriteFile(constants.WATCHER_PAUSEFILE,
|
|
533 |
utils.WriteFile(pathutils.WATCHER_PAUSEFILE,
|
|
533 | 534 |
data="%d\n" % (until, )) |
534 | 535 |
|
535 | 536 |
return until |
... | ... | |
689 | 690 |
""" |
690 | 691 |
# This is safe to do as the pid file guarantees against |
691 | 692 |
# concurrent execution. |
692 |
utils.RemoveFile(constants.MASTER_SOCKET)
|
|
693 |
utils.RemoveFile(pathutils.MASTER_SOCKET)
|
|
693 | 694 |
|
694 | 695 |
mainloop = daemon.Mainloop() |
695 |
master = MasterServer(constants.MASTER_SOCKET, options.uid, options.gid)
|
|
696 |
master = MasterServer(pathutils.MASTER_SOCKET, options.uid, options.gid)
|
|
696 | 697 |
return (mainloop, master) |
697 | 698 |
|
698 | 699 |
|
... | ... | |
712 | 713 |
finally: |
713 | 714 |
rpc.Shutdown() |
714 | 715 |
finally: |
715 |
utils.RemoveFile(constants.MASTER_SOCKET)
|
|
716 |
utils.RemoveFile(pathutils.MASTER_SOCKET)
|
|
716 | 717 |
|
717 | 718 |
logging.info("Clean master daemon shutdown") |
718 | 719 |
|
Also available in: Unified diff