Skip to content

fix: narrow catch clauses in fetchCacheMetrics/fetchHandlerMetrics #111

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adityamparikh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: narrow catch clauses in fetchCacheMetrics/fetchHandlerMetrics #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df481e
fix: narrow catch clauses in fetchCacheMetrics/fetchHandlerMetrics
adityamparikh Apr 24, 2026
ab1aa24
docs: correct the Solr 10 metrics catch described in AGENTS.md
adityamparikh Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,11 @@ The Solr Docker image used in tests is configurable via the `solr.test.image` sy
### Solr 10 Compatibility

Solr 10.0.0 is fully supported with the JSON wire format. The `/admin/mbeans` endpoint was
removed in Solr 10; `getCacheMetrics()` and `getHandlerMetrics()` now catch `RuntimeException`
(which covers `RemoteSolrException`) so they degrade gracefully and return `null`. Tests that
check `cacheStats` and `handlerStats` already handle `null` values.
removed in Solr 10; `getCacheMetrics()` and `getHandlerMetrics()` catch `SolrException` (which
`RemoteSolrException` extends) so they degrade gracefully and return `null`. Tests that check
`cacheStats` and `handlerStats` already handle `null` values. The catch is deliberately *not*
`RuntimeException`: an unrelated runtime failure inside metrics parsing should surface as a bug,
not be silently reported as "metrics unavailable".

Remaining known differences from Solr 9:
- **`/admin/mbeans` removed:** Cache and handler stats from `getCollectionStats()` will always be `null` on Solr 10. A future migration to `/admin/metrics` will restore these metrics.
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/apache/solr/mcp/server/collection/CollectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.solr.client.solrj.response.LukeResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.mcp.server.config.SolrConfigurationProperties;
Expand Down Expand Up @@ -692,7 +693,7 @@ public QueryStats buildQueryStats(QueryResponse response) {

CacheStats stats = extractCacheStats(coreMetrics);
return isCacheStatsEmpty(stats) ? null : stats;
} catch (SolrServerException | IOException | RuntimeException _) {
} catch (SolrServerException | IOException | SolrException _) {
return null;
}
}
Expand Down Expand Up @@ -810,7 +811,7 @@ private CacheStats extractCacheStats(NamedList<Object> coreMetrics) {

HandlerStats stats = new HandlerStats(selectHandler, updateHandler);
return isHandlerStatsEmpty(stats) ? null : stats;
} catch (SolrServerException | IOException | RuntimeException _) {
} catch (SolrServerException | IOException | SolrException _) {
return null;
}
}
Expand Down