webui: separate search results by job ids #170
Closed
Conversation
This file contains 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
| }); | ||
|
|
||
| Meteor.publish(Meteor.settings.public.SearchResultsCollectionName, function search_results_publication({ | ||
| visibleTimeRange, | ||
| fieldToSortBy, | ||
| visibleSearchResultsLimit | ||
| }) { | ||
| if ((!currentServerStateList[this.userId]) || !(currentServerStateList[this.userId].jobID)) { |
There was a problem hiding this comment.
Suggested change
| if ((!currentServerStateList[this.userId]) || !(currentServerStateList[this.userId].jobID)) { | |
| if (null === currentServerStateList[this.userId] || undefined === currentServerStateList[this.userId].jobID) { |
We should make explicit comparison rather than using !
Comment on lines
+52
to
+53
| if ((MyCollections[Meteor.settings.public.SearchResultsCollectionName] !== undefined) && | ||
| (MyCollections[Meteor.settings.public.SearchResultsCollectionName]._name === collectionName)) { |
There was a problem hiding this comment.
Suggested change
| if ((MyCollections[Meteor.settings.public.SearchResultsCollectionName] !== undefined) && | |
| (MyCollections[Meteor.settings.public.SearchResultsCollectionName]._name === collectionName)) { | |
| if (undefined !== MyCollections[Meteor.settings.public.SearchResultsCollectionName] && | |
| collectionName === MyCollections[Meteor.settings.public.SearchResultsCollectionName]._name) { |
We should try to keep the rvalue on the lhs
| const [resultHighlightRegex, numSearchResultsOnServer, timeline] = useTracker(() => { | ||
| if ((!serverState) || !(serverState.jobID)) { |
There was a problem hiding this comment.
Suggested change
| if ((!serverState) || !(serverState.jobID)) { | |
| if ((null === serverState) || (undefined === serverState.jobID)) { |
| @@ -534,10 +533,12 @@ async def cancel_metadata_task(task, pending_tasks, query_done_event): | |||
| query_done_event.clear() | |||
|
|
|||
|
|
|||
| # FIXME: only clear specific job in meta | |||
There was a problem hiding this comment.
Can we move this inline comment to the function body and mark it as TODO?
Comment on lines
+10
to
+11
| if ((MyCollections[sessionId] !== undefined) && | ||
| (MyCollections[sessionId][Meteor.settings.public.SearchResultsCollectionName]._name === collectionName)) { |
There was a problem hiding this comment.
Suggested change
| if ((MyCollections[sessionId] !== undefined) && | |
| (MyCollections[sessionId][Meteor.settings.public.SearchResultsCollectionName]._name === collectionName)) { | |
| if (undefined !== MyCollections[sessionId] && | |
| collectionName === MyCollections[sessionId][Meteor.settings.public.SearchResultsCollectionName]._name) { |
| @@ -109,33 +117,43 @@ const SearchView = () => { | |||
| findOptions["sort"] = sort; | |||
| } | |||
|
|
|||
| if ((!serverState) || !(serverState.jobID)) { | |||
There was a problem hiding this comment.
Suggested change
| if ((!serverState) || !(serverState.jobID)) { | |
| if (null === serverState || undefined === serverState.jobID) { |
I am not sure if it is possible for serverState.jobID to be null as well
| timeline = timelineDoc; | ||
| // FIXME: add job id | ||
| const metaDoc = SearchResultsMetadataCollection.findOne({_id: `meta-job-${serverState.jobID}`}); | ||
| if (metaDoc) { |
There was a problem hiding this comment.
Suggested change
| if (metaDoc) { | |
| if (null !== metaDoc) { |
| @@ -604,7 +624,7 @@ const SearchResultsTable = ({ | |||
| } | |||
|
|
|||
| let result = searchResult[columnName]; | |||
| if (typeof(result) === "object") { | |||
| if (typeof (result) === "object") { | |||
There was a problem hiding this comment.
Why do we need the space here?
| @@ -88,6 +88,7 @@ class WebUiQueryHandlerWebsocket { | |||
| case ServerMessageType.QUERY_STARTED: | |||
| if (SearchState.WAITING_FOR_QUERY_TO_START === currentServerStateList[this.__sessionId].state) { | |||
| currentServerStateList[this.__sessionId].state = SearchState.QUERY_IN_PROGRESS; | |||
| currentServerStateList[this.__sessionId].jobID = message['value']['jobID'] | |||
There was a problem hiding this comment.
Suggested change
| currentServerStateList[this.__sessionId].jobID = message['value']['jobID'] | |
| currentServerStateList[this.__sessionId].jobID = message['value']['jobID']; |
| const timelineDoc = MyCollections[Meteor.settings.public.SearchResultsMetadataCollectionName].findOne({_id: "timeline"}); | ||
| if (timelineDoc) { | ||
| timeline = timelineDoc; | ||
| // FIXME: add job id |
|
Closing this as refactoring changes has been proposed and being PR'ed at #250 . |
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.
References
Kirk reported that race conditions in search results and/or metadata were discovered when the server was undergoing high load.
Description
results_${job_id}.job_idas part of the state reporting back to the meteor server, which is later propagated to the meteor client side.results_${job_id}and metadata fromresults-metadata's documentmeta-job-${job_id}.Validation performed
Manual integration test. Steps include:
clp-package.clp-package.http://localhost:4000and start a search query.http://localhost:4000, effectively emulating another user visiting the same site. Start a search query.