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

Avoid parallel table.close() on the same table #25

Merged
merged 1 commit into from
Nov 28, 2019

Conversation

will-moore
Copy link
Member

@will-moore will-moore commented Oct 3, 2019

For tables on Projects or Datasets, we try 2 queries image=1 (lowercase) and Image=1 on the same Table at the same time, which leads to errors. See #6

This changes the webclient right panel to make each pair of queries run in series instead of parallel.

Screenshot shows calls in Chrome dev-tools before this PR, where we try to load table data on a parent Screen, Plate, Project (x2) and Dataset (x2) all at once.

Screen Shot 2019-10-03 at 14 47 58

With this PR, we wait for the first queries on Project and Dataset to return, and if they have no data then we make another call with the alternative query:

Screen Shot 2019-10-03 at 14 40 45

To test, check that table data is shown as expected with no error dialogs.

This can be tested at https://merge-ci.openmicroscopy.org/web/webclient/?show=dataset-4919 (user-3), which was the sample data originally used to replicate the error.
NB: In this data, the first call to get table data from Dataset is successful, so a second call is never made.

@jburel
Copy link
Member

jburel commented Nov 7, 2019

Time to go back to this PR?

@pwalczysko
Copy link
Member

Tables are shown as expected on py3-ci and merge-ci. I tried (on merge-ci) both the orphaned dataset indicated in the PR header as well as the idr0021 project table. On py3-ci, I have tried only the idr0021 project table.

I found the "waterfall" feature of the developer tools in chrome (at least temporarily) but did not see any of the green bars as shown in the header of this PR - maybe I need ot readjust something. ?

@joshmoore
Copy link
Member

@pwalczysko : i.e. you need to help to finish this review?

@pwalczysko
Copy link
Member

@will-moore helped me to find the "waterfall" feature in the browser.

Again, confirmed that I am not getting the errors in the UI and also, my screenshots (see below) look as expected in the sense of the two calls for image and Image waiting for one another as expected (i.e. the image call waits for the Image call to finish before being sent off). This was verified by reading the tooltips on the lines in the "waterfall" table. Tested both table on a Project as well as table on a Dataset.
Screen Shot 2019-11-28 at 15 20 28

Screen Shot 2019-11-28 at 15 23 50

Ready to merge fmpov

@joshmoore joshmoore merged commit 773cc10 into ome:master Nov 28, 2019
@will-moore will-moore deleted the fix_table_close_right_panel_bug branch February 24, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants