Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cleaning > 10000 channels #81

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Fix cleaning > 10000 channels #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52f0e6b
Fix cleaning > 10000 channels
jacomago Apr 12, 2024
65d2662
Use findSizeLimit as size limit
jacomago Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions server/recceiver/cfstore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,17 +282,14 @@ def clean_service(self):
while 1:
try:
_log.info("CF Clean Started")
channels = self.client.findByArgs(prepareFindArgs(self.conf, [('pvStatus', 'Active'), (RECCEIVERID_KEY, recceiverid)]))
channels = self.get_active_channels(recceiverid)
if channels is not None:
new_channels = []
for ch in channels or []:
new_channels.append(ch[u'name'])
_log.info("Total channels to update: {nChannels}", nChannels=len(new_channels))
while len(new_channels) > 0:
_log.debug('Update "pvStatus" property to "Inactive" for {n_channels} channels', n_channels=min(len(new_channels), 10000))
self.client.update(property={u'name': 'pvStatus', u'owner': owner, u'value': "Inactive"},
channelNames=new_channels[:10000])
new_channels = new_channels[10000:]
while channels is not None and len(channels) > 0:
self.clean_channels(owner, channels)
channels = self.get_active_channels(recceiverid)
_log.info("CF Clean Completed")
return
else:
_log.info("CF Clean Completed")
return
except RequestException as e:
Expand All @@ -305,6 +302,18 @@ def clean_service(self):
_log.info("Abandoning clean after {retry_limit} seconds", retry_limit=retry_limit)
return

def get_active_channels(self, recceiverid):
return self.client.findByArgs(prepareFindArgs(self.conf, [('pvStatus', 'Active'), (RECCEIVERID_KEY, recceiverid)]))

def clean_channels(self, owner, channels):
new_channels = []
for ch in channels or []:
new_channels.append(ch[u'name'])
_log.info("Total channels to update: {nChannels}", nChannels=len(new_channels))
_log.debug('Update "pvStatus" property to "Inactive" for {n_channels} channels', n_channels=min(len(new_channels), self.conf["findSizeLimit"]))
self.client.update(property={u'name': 'pvStatus', u'owner': owner, u'value': "Inactive"},
channelNames=new_channels)


def dict_to_file(dict, iocs, conf):
filename = conf.get('debug_file_loc', None)
Expand Down Expand Up @@ -544,10 +553,10 @@ def getCurrentTime():
return str(datetime.datetime.now())


def prepareFindArgs(conf, args):
size = conf.get('findSizeLimit', 0)
if size > 0:
args.append(('~size', size))
def prepareFindArgs(conf, args, size=0):
size_limit = conf.get('findSizeLimit', size)
if size_limit > 0:
args.append(('~size', size_limit))
return args


Expand Down
Loading