burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed oVirt jobs & aasigned an unused worker

Browse Source
This commit is contained in:
Adolfo Gómez García 2019-12-26 11:54:55 +01:00
parent 8cded2bca7
commit ddc2699774
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/core/workers/assigned_unused.py
View File

@ -45,8 +45,8 @@ class AssignedAndUnused(Job):
# frecuency_cfg = GlobalConfig.CHECK_UNUSED_TIME # frecuency_cfg = GlobalConfig.CHECK_UNUSED_TIME
friendly_name = 'Unused services checker' friendly_name = 'Unused services checker'
def run(self): def run(self) -> None:
since_state = getSqlDatetime() - timedelta(seconds=GlobalConfig.CHECK_UNUSED_TIME) since_state = getSqlDatetime() - timedelta(seconds=GlobalConfig.CHECK_UNUSED_TIME.getInt())
for ds in ServicePool.objects.all(): for ds in ServicePool.objects.all():
# Skips checking deployed services in maintenance mode or ignores assigned and unused # Skips checking deployed services in maintenance mode or ignores assigned and unused
if ds.isInMaintenance() is True or ds.ignores_unused: if ds.isInMaintenance() is True or ds.ignores_unused:

14
server/src/uds/services/OVirt/jobs.py
View File

@ -34,6 +34,8 @@ import typing
from uds.core import jobs from uds.core import jobs
from uds.models import Provider
# Not imported at runtime, just for type checking # Not imported at runtime, just for type checking
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
from .provider import OVirtProvider from .provider import OVirtProvider
@ -75,21 +77,21 @@ class OVirtDeferredRemoval(jobs.Job):
except Exception as e: except Exception as e:
logger.warning('Exception got queuing for Removal: %s', e) logger.warning('Exception got queuing for Removal: %s', e)
def run(self): def run(self) -> None:
from .provider import OVirtProvider from .provider import OVirtProvider
logger.debug('Looking for deferred vm removals') logger.debug('Looking for deferred vm removals')
provider: OVirtProvider provider: Provider
# Look for Providers of type VCServiceProvider # Look for Providers of type VCServiceProvider
for provider in OVirtProvider.objects.filter(maintenance_mode=False, data_type=OVirtProvider.typeType): for provider in Provider.objects.filter(maintenance_mode=False, data_type=OVirtProvider.typeType):
logger.debug('Provider %s if os type ovirt', provider) logger.debug('Provider %s if os type ovirt', provider)
storage = provider.getEnvironment().storage storage = provider.getEnvironment().storage
instance = provider.getInstance() instance: OVirtProvider = typing.cast(OVirtProvider, provider.getInstance())
for i in storage.filter('tRm'): for i in storage.filter('tRm'):
vmId = i[1] vmId = i[1].decode()
try: try:
logger.debug('Found %s for removal %s', vmId, i) logger.debug('Found %s for removal %s', vmId, i)
# If machine is powered on, tries to stop it # If machine is powered on, tries to stop it
@ -105,7 +107,7 @@ class OVirtDeferredRemoval(jobs.Job):
# It this is reached, remove check # It this is reached, remove check
storage.remove('tr' + vmId) storage.remove('tr' + vmId)
except Exception as e: # Any other exception wil be threated again except Exception as e: # Any other exception wil be threated again
instance.doLog('Delayed removal of %s has failed: %s. Will retry later', vmId, e) # instance.doLog('Delayed removal of %s has failed: %s. Will retry later', vmId, e)
logger.error('Delayed removal of %s failed: %s', i, e) logger.error('Delayed removal of %s failed: %s', i, e)
logger.debug('Deferred removal finished') logger.debug('Deferred removal finished')