oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FileServer: don't schedule multiple updates for the same site in parallel

Browse source
This commit is contained in:
Vadim Ushakov 2021-10-22 17:18:24 +07:00
parent 1ef129bdf9
commit 1b68182a76
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/File/FileServer.py
View file

@ -313,13 +313,34 @@ class FileServer(ConnectionServer):
log.debug("Checking randomly chosen site: %s", site.address_short) log.debug("Checking randomly chosen site: %s", site.address_short)
self.updateSite(site) self.spawnUpdateSite(site).join()
def updateSite(self, site, check_files=False, verify_files=False): def updateSite(self, site, check_files=False, verify_files=False):
if not site: if not site:
return False return False
return site.update2(check_files=check_files, verify_files=verify_files) return site.update2(check_files=check_files, verify_files=verify_files)
def spawnUpdateSite(self, site, check_files=False, verify_files=False):
thread = self.update_pool.spawn(self.updateSite, site,
check_files=check_files, verify_files=verify_files)
thread.site_address = site.address
return thread
def siteIsInUpdatePool(self, site_address):
while True:
restart = False
for thread in list(iter(self.update_pool)):
if not thread.site_address:
# Possible race condition in assigning thread.site_address in spawnUpdateSite()
# Trying again.
self.sleep(0.1)
restart = True
break
if thread.site_address == site_address:
return True
if not restart:
return False
def invalidateUpdateTime(self, invalid_interval): def invalidateUpdateTime(self, invalid_interval):
for address in self.getSiteAddresses(): for address in self.getSiteAddresses():
site = self.getSite(address) site = self.getSite(address)
@ -370,13 +391,13 @@ class FileServer(ConnectionServer):
break break
site = self.getSite(site_address) site = self.getSite(site_address)
if not site or site.isUpdateTimeValid(): if not site or site.isUpdateTimeValid() or self.siteIsInUpdatePool(site_address):
sites_skipped += 1 sites_skipped += 1
continue continue
sites_processed += 1 sites_processed += 1
thread = self.update_pool.spawn(self.updateSite, site) thread = self.spawnUpdateSite(site)
if not self.isActiveMode(): if not self.isActiveMode():
break break
@ -436,6 +457,12 @@ class FileServer(ConnectionServer):
self.sleep(long_timeout) self.sleep(long_timeout)
continue continue
while self.siteIsInUpdatePool(site_address) and self.isActiveMode():
self.sleep(1)
if not self.isActiveMode():
break
site = self.getSite(site_address) site = self.getSite(site_address)
if not site: if not site:
continue continue
@ -451,7 +478,7 @@ class FileServer(ConnectionServer):
log.info("running <%s> for %s" % (mode, site.address_short)) log.info("running <%s> for %s" % (mode, site.address_short))
thread = self.update_pool.spawn(self.updateSite, site, thread = self.spawnUpdateSite(site,
check_files=check_files, verify_files=verify_files) check_files=check_files, verify_files=verify_files)
log.info("sitesVerificationThread stopped") log.info("sitesVerificationThread stopped")