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

Now machines does not locks forever....

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-03-01 13:00:30 +01:00
parent a2a8f157e0
commit 017aa46403
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/uds/services/PhysicalMachines/service_multi.py
View File

@ -37,9 +37,11 @@ import typing
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db import transaction from django.db import transaction
from uds.models import getSqlDatetimeAsUnix
from uds.core.ui import gui from uds.core.ui import gui
from uds.core.util import log from uds.core.util import log
from uds.core.util import connection from uds.core.util import connection
from uds.core.util import config
from uds.core.services import types as serviceTypes from uds.core.services import types as serviceTypes
from .deployment import IPMachineDeployed from .deployment import IPMachineDeployed
@ -101,18 +103,13 @@ class IPMachinesService(IPServiceBase):
self._ips = [] self._ips = []
else: else:
self._ips = ['{}~{}'.format(str(ip).strip(), i) for i, ip in enumerate(values['ipList']) if str(ip).strip()] # Allow duplicates right now self._ips = ['{}~{}'.format(str(ip).strip(), i) for i, ip in enumerate(values['ipList']) if str(ip).strip()] # Allow duplicates right now
active = {v for v in values['ipList']} # Current stored data, if it exists
# self._ips.sort() d = self.storage.readData('ips')
# Remove non existing "locked" ips from storage now old_ips = pickle.loads(d) if d and isinstance(d, bytes) else []
skipKey = self.storage.getKey('ips')
with transaction.atomic(): with transaction.atomic():
for key, data, _ in self.storage.filter(forUpdate=True): for old in old_ips:
if key == skipKey: # Avoid "ips" key if old not in self._ips:
continue self.storage.remove(old.split('~')[0])
# If not in current active list of ips, remove it
if data.decode() not in active:
logger.info('IP %s locked but not in active list. Removed', data.decode())
self.storage.remove(data.decode())
self._token = self.token.value.strip() self._token = self.token.value.strip()
self._port = self.port.value self._port = self.port.value
@ -153,12 +150,15 @@ class IPMachinesService(IPServiceBase):
def getUnassignedMachine(self) -> typing.Optional[str]: def getUnassignedMachine(self) -> typing.Optional[str]:
# Search first unassigned machine # Search first unassigned machine
try: try:
now = getSqlDatetimeAsUnix()
consideredFreeTime = now - config.GlobalConfig.SESSION_EXPIRE_TIME.getInt(force=False) * 24
for ip in self._ips: for ip in self._ips:
theIP = ip.split('~')[0] theIP = ip.split('~')[0]
if self.storage.readData(theIP) is None: locked = self.storage.getPickle(theIP)
if not locked or locked < consideredFreeTime:
if self._port > 0 and self._skipTimeOnFailure > 0 and self.cache.get('port{}'.format(theIP)): if self._port > 0 and self._skipTimeOnFailure > 0 and self.cache.get('port{}'.format(theIP)):
continue # The check failed not so long ago, skip it... continue # The check failed not so long ago, skip it...
self.storage.saveData(theIP, theIP) self.storage.putPickle(theIP, now)
# Now, check if it is available on port, if required... # Now, check if it is available on port, if required...
if self._port > 0: if self._port > 0:
if connection.testServer(theIP, self._port, timeOut=0.5) is False: if connection.testServer(theIP, self._port, timeOut=0.5) is False: