Ticket8445 handle removal of defaults from config#444
Open
LowriJenkins wants to merge 12 commits intomasterfrom
Open
Ticket8445 handle removal of defaults from config#444LowriJenkins wants to merge 12 commits intomasterfrom
LowriJenkins wants to merge 12 commits intomasterfrom
Conversation
075b0f9 to
6795375
Compare
6795375 to
0ca0d0d
Compare
4 tasks
936545d to
ebd365c
Compare
Tom-Willemsen
requested changes
Feb 12, 2026
Member
Tom-Willemsen
left a comment
There was a problem hiding this comment.
Unfortunately, this branch completely crashes my local blockserver with:
Exception in thread Thread-11 (consume_write_queue):
[2026-02-12 17:33:18.604585] MINOR: ComponentSwitcher: component_switcher config file at C:/Instrument/Settings/config/NDW2922/configurations\ComponentSwitcher\component_switcher.json does not exist - assuming empty config
Traceback (most recent call last):
File "C:\Instrument\Apps\Python3\Lib\threading.py", line 1043, in _bootstrap_inner
self.run()
~~~~~~~~^^
File "C:\Instrument\Apps\Python3\Lib\threading.py", line 994, in run
self._target(*self._args, **self._kwargs)
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "C:\Instrument\Apps\EPICS\ISIS\inst_servers\master\\block_server.py", line 737, in consume_write_queue
self.update_server_status(state)
~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^
File "C:\Instrument\Apps\EPICS\ISIS\inst_servers\master\\block_server.py", line 678, in update_server_status
raise RuntimeError
RuntimeError
Traceback (most recent call last):
File "C:\Instrument\Apps\Python3\Lib\site-packages\pcaspy\driver.py", line 631, in getValue
newValue = driver.read(self.info.reason)
File "C:\Instrument\Apps\EPICS\ISIS\inst_servers\master\\block_server.py", line 288, in read
raise RuntimeError
RuntimeError
Traceback (most recent call last):
File "C:\Instrument\Apps\Python3\Lib\site-packages\pcaspy\cas.py", line 582, in read
return _cas.PV_read(self, ctx, protoIn)
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
RuntimeError: SWIG director method error. Exception Calling Python Code
RuntimeError: SWIG director method error. Exception Calling Python Code
The above exception was the direct cause of the following exception:
SystemError: <function SimplePV.interestDelete at 0x000001A39A011BC0> returned a result with an exception set
This crash does not occur on the master branch.
d5dc293 to
57a1d58
Compare
Contributor
Author
|
doing some more bugfixing for some errors introduced during pyright/ruff have led to another file needing pyright checking, but once thats done this should be ready to go |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of work
Add a check when adding macros to the blockserver configs to not create them if the gui passes them with the
useDefaultvalue set to true. And run ruff format and check.To test
Which ticket does this PR fix?
Acceptance criteria
List the acceptance criteria for the PR
Code Review
Functional Tests
Final steps