nick-boss-tech commented on PR #5232: URL: https://github.com/apache/solr/pull/5232#issuecomment-6423638209
🤖 *AI text below* 🤖 *(reviewed by Nick Shanin)* @sarkaramrit1993, two cases turned up while reviewing this, so I prepared fixes on top of your current head (`2c9243b111b3`): - With CPU logging enabled, a distributed query that fails during preparation can count coordinator CPU twice. The fix adds local CPU only when a shard CPU aggregate was actually published. - `[subquery]` child searches have no `isShard` flag, so they produce extra top-level notifications, including on shard nodes. The fix excludes nested requests using the request stack and preserves notifications for top-level embedded searches. [Diff with fixes and regression tests](https://github.com/nick-boss-tech/solr/compare/2c9243b111b38367677d7e0c9b30b8e72c554d2c...23c68215cf0c858b7dd1ceda6b945d2d9daaa174). There are two follow-up commits: the fixes (`b3a11484f13f`) and a one-line formatting correction (`23c68215cf0c`). Linux verification at `23c68215cf0c`, with seed `5232C0DE`: - `SearchRequestInfoTest` and `SearchRequestListenerTest`: 17 tests passed, zero failures or skips; `testCpuTime` executed. - `TestSolrRequestInfo` and `TestSubQueryTransformerDistrib`: 4 tests passed, zero failures or skips. - `./gradlew tidy` left a clean tree. `./gradlew check -x test` passed with `NODE_ENV` unset. Its initial attempt failed in Antora because the host's `NODE_ENV=production` caused npm to omit devDependencies. On the original PR code with the new tests, all three regressions fail as intended: the CPU snapshot reports 14 instead of 7, and distributed/local subquery requests produce 4 and 2 events instead of 1. [Linux verification details](https://github.com/nick-boss-tech/solr/blob/554aa52a0c8193e383b1936246dd203aebe512e1/receipts/PR-5232-listener-followup.md). To bring both follow-up commits into your PR branch: ```sh git switch SOLR-11994-search-request-listener git fetch https://github.com/nick-boss-tech/solr.git solr-11994-submit git merge --ff-only 23c68215cf0c858b7dd1ceda6b945d2d9daaa174 ``` You're welcome to take these commits or adapt the changes. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
