X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=329f83885a693386b0a6569a469abb8a7737e61a;hb=115d6c76a505e56954d79e09867016e842a9bf95;hp=65da8730f55efd65d210452de2bcb08b7ddcdb9a;hpb=840ae606578c13830db0be0b8de735fe0c318199;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 65da873..329f838 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -23,15 +23,14 @@ import errno import traceback import os, os.path import time +from threading import BoundedSemaphore +# the util-vserver-pl module import vserver import accounts import logger import tools -from threading import BoundedSemaphore - -globalsem = BoundedSemaphore() # special constant that tells vserver to keep its existing settings KEEP_LIMIT = vserver.VC_LIM_KEEP @@ -50,7 +49,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): SHELL = '/bin/vsh' TYPE = 'sliver.VServer' - _init_disk_info_sem = globalsem + _init_disk_info_sem = BoundedSemaphore() def __init__(self, rec): name=rec['name'] @@ -175,6 +174,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): self.vm_running = False Sliver_VS._init_disk_info_sem.acquire() logger.log('sliver_vs: %s: computing disk usage: beginning' % self.name) + # init_disk_info is inherited from VServer try: self.init_disk_info() finally: Sliver_VS._init_disk_info_sem.release() logger.log('sliver_vs: %s: computing disk usage: ended' % self.name)