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.

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

ShanoirUploader: auto test import + perf optimization QueryPACSService #1895

Merged
merged 34 commits into from
Oct 23, 2023

Conversation

michaelkain
Copy link
Contributor

@michaelkain michaelkain commented Oct 5, 2023

  • all imports: fixes for images==null issues in MS import + fixes for index == null issues in ms datasets
  • ofsep issue: new contrast agent used enum value added
  • increase version of dcm4che3
  • query pacs: performance booster: stop opening a new network connection for hundreds of c-finds, depending on the query result, per search criteria
  • ShUp: final fix for import-from-pacs, after refactoring
  • ShUp: final fix for import-from-files, after refactoring
  • ShUp: query pacs: now default of enter button on keyboard, to avoid mouse usage
  • ShUp: new feature: configure default profile for ShUp to avoid asking the user at every start up, in basic.properties
  • adjust StudyApiController: add current user as StudyUser, in case of empty StudyUserList
  • ShUp: includes creation of study from within ShUp

@michaelkain michaelkain marked this pull request as draft October 5, 2023 13:14
@michaelkain michaelkain marked this pull request as ready for review October 18, 2023 14:47
@michaelkain
Copy link
Contributor Author

michaelkain commented Oct 18, 2023

Hi @jcomedouteau, this PR could be interesting for the new release, as it should dramatically increase the query time on import-from-pacs. I tested locally. Maybe you could have a look on qualif? with this PR if import-from-pacs works and is faster. It will be interesting to see, if after some hours, it still works. I have not found what timeout is applied on the socket connection... With kind regards and happy reading and testing, Michael

@michaelkain michaelkain added the REVIEWABLE Has to be reviewed label Oct 18, 2023
@michaelkain michaelkain changed the title ShanoirUploader: auto test import ShanoirUploader: auto test import + perf optimization QueryPACSService Oct 18, 2023
@jcomedouteau
Copy link
Collaborator

I'm on it :)

@jcomedouteau
Copy link
Collaborator

jcomedouteau commented Oct 19, 2023

On qualif, I can't request for the PACS with 'test':

2023-10-19T14:06:57.642+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Calling PACS, C-FIND with level: PATIENT
2023-10-19T14:06:57.643+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Tag: PatientName, Value: [test]
2023-10-19T14:06:57.643+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Tag: PatientID, Value: []
2023-10-19T14:06:57.643+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Tag: PatientBirthDate, Value: []
2023-10-19T14:06:57.643+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Tag: PatientBirthName, Value: []
2023-10-19T14:06:57.643+02:00 INFO 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Tag: PatientSex, Value: []
2023-10-19T14:06:57.643+02:00 ERROR 1 --- [http-nio-9903-exec-1] o.s.n.i.dicom.query.QueryPACSService : Error in c-find query:

java.io.EOFException: null
at org.dcm4che3.util.StreamUtils.readFully(StreamUtils.java:69)
at org.dcm4che3.net.PDUDecoder.readFully(PDUDecoder.java:225)
at org.dcm4che3.net.PDUDecoder.nextPDU(PDUDecoder.java:159)
at org.dcm4che3.net.Association$2.run(Association.java:520)
at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)

I think you can set a timeout in the connection configuration, but it's hard to say which one we need to configure..

@michaelkain
Copy link
Contributor Author

michaelkain commented Oct 20, 2023

Hi @jcomedouteau, locally the new query impl. with connect + release, works fine. I tested with import-from-pacs web GUI. It works as well in ShUp (echo + find), locally.

@jcomedouteau
Copy link
Collaborator

Working well for the moment, I'll test in ~1h (even if the logic has changed, just to be sure), and we'll be OK.

@jcomedouteau jcomedouteau merged commit 6791ed0 into fli-iam:develop Oct 23, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
REVIEWABLE Has to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants