SOLR-12613: node picker for cross-node screens by iprithv · Pull Request #5110 · apache/solr

iprithv · 2026-10-12T14:39:23Z

https://issues.apache.org/jira/browse/SOLR-12613

HACKATHON :)

added a Node picker so Thread Dump, Java Properties, Logging, Cores, and Dashboard can target any live node via the existing nodes= proxy.

sidebar is split into Cluster and Node. Works in SolrCloud and stays out of the way in standalone.

NOTE: See the Video Walkthrough: https://share.descript.com/view/P2Fn8J8Zabh

SOLR-12613_.node.picker.for.cross-node.screens.mp4

…d Cluster/Node sidebar. Signed-off-by: prithvi <prithvisivasankar@gmail.com>

iprithv · 2026-10-12T14:51:05Z

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

… tests. Signed-off-by: prithvi <prithvisivasankar@gmail.com>

janhoy · 2026-10-12T18:25:50Z

First question: The "node selector" dropdown, I suppose will still be valid only for the current node, i.e. query, update, schema, segments etc etc? Users may believe that it also obeys the chosen node. Not sure how to deal with that.

Copilot

🟡 Changes recommended

Persisted targets can display local data as remote, and remote Core Admin views can execute mutations against the wrong node.

6 open findings

What changed in this PR

Adds cross-node targeting to the legacy Admin UI and supporting V2 node APIs.

Changes:

Adds a persistent live-node picker and reorganizes the sidebar.
Extends node-local APIs with nodes proxy support.
Adds backend proxy integration tests and UI styling.

File	Description
`solr/webapp/web/partials/logging-levels.html`	Adds cluster-wide logging notice.
`solr/webapp/web/partials/index.html`	Displays the selected node.
`solr/webapp/web/partials/cores.html`	Uses cloud-mode state consistently.
`solr/webapp/web/partials/cloud.html`	Adds node dashboard and Admin UI links.
`solr/webapp/web/js/angular/services.js`	Introduces persistent node-target state.
`solr/webapp/web/js/angular/controllers/threads.js`	Targets thread dumps by node.
`solr/webapp/web/js/angular/controllers/logging.js`	Targets log messages and adjusts level broadcasting.
`solr/webapp/web/js/angular/controllers/java-properties.js`	Targets Java properties by node.
`solr/webapp/web/js/angular/controllers/index.js`	Targets dashboard system information.
`solr/webapp/web/js/angular/controllers/cores.js`	Loads core status from selected nodes.
`solr/webapp/web/js/angular/controllers/collection-overview.js`	Guards missing collection data.
`solr/webapp/web/js/angular/controllers/cloud.js`	Connects node rows to target selection.
`solr/webapp/web/js/angular/app.js`	Integrates node state into navigation.
`solr/webapp/web/index.html`	Adds the node picker and reorganized menu.
`solr/webapp/web/css/angular/menu.css`	Styles the reorganized sidebar and selectors.
`solr/webapp/web/css/angular/logging.css`	Styles the logging notice.
`solr/webapp/web/css/angular/common.css`	Styles the selected-node badge.
`solr/webapp/web/css/angular/cloud.css`	Styles node Admin UI links.
`solr/core/src/test/org/apache/solr/handler/admin/ThreadDumpHandlerTest.java`	Adapts thread-dump tests.
`solr/core/src/test/org/apache/solr/handler/admin/api/NodeLoggingAPITest.java`	Adapts logging API tests.
`solr/core/src/test/org/apache/solr/handler/admin/api/NodeAdminProxySolrCloudTest.java`	Tests proxied node APIs.
`solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java`	Adapts the V1 thread handler.
`solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java`	Adapts the V1 logging handler.
`solr/core/src/java/org/apache/solr/handler/admin/api/NodeThreadsAPI.java`	Adds thread-dump proxying.
`solr/core/src/java/org/apache/solr/handler/admin/api/NodeLogging.java`	Adds logging-read proxying.
`solr/core/src/java/org/apache/solr/handler/admin/api/GetNodeProperties.java`	Adds properties proxying.
`solr/core/src/java/org/apache/solr/handler/admin/api/CoreStatus.java`	Adds core-status proxying.
`solr/api/src/java/org/apache/solr/client/api/model/NodeThreadsResponse.java`	Supports keyed remote responses.
`solr/api/src/java/org/apache/solr/client/api/model/NodePropertiesResponse.java`	Supports keyed remote responses.
`solr/api/src/java/org/apache/solr/client/api/model/LoggingResponse.java`	Supports keyed remote responses.
`solr/api/src/java/org/apache/solr/client/api/model/CoreStatusResponse.java`	Supports keyed remote responses.
`solr/api/src/java/org/apache/solr/client/api/endpoint/NodeThreadsApi.java`	Adds the `nodes` parameter.
`solr/api/src/java/org/apache/solr/client/api/endpoint/NodePropertiesApi.java`	Adds the `nodes` parameter.
`solr/api/src/java/org/apache/solr/client/api/endpoint/NodeLoggingApis.java`	Adds logging `nodes` parameters.
`solr/api/src/java/org/apache/solr/client/api/endpoint/CoreApis.java`	Adds core-status node targeting.
`changelog/unreleased/PR#5110-admin-ui-node-picker.yml`	Documents the feature.

🧠 Review effort: Balanced

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

+        CoresV2.getAllCoreStatus(NodeTarget.withNodes({}), function(error, data, response) {
          $timeout(function() {
            if (error) { ApiErrorHandler.handle(response); return; }
+            var payload = NodeTarget.unwrap(data, response) || {};


Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

iprithv · 2026-10-12T21:55:30Z

First question: The "node selector" dropdown, I suppose will still be valid only for the current node, i.e. query, update, schema, segments etc etc? Users may believe that it also obeys the chosen node. Not sure how to deal with that.

yeah.. picker is only for the Node screens. core menu already hides on a remote node, and i added a "Node screens only" hint :)

iprithv · 2026-10-12T22:05:11Z

+                            ng-options="node as nodeLabel(node) for node in liveNodes"></select>
+                  </div>
+                  <p id="node-selector-hint" ng-class="{remote: viewingRemoteNode}">
+                    {{ viewingRemoteNode ? 'Remote node (Node screens only)' : 'This node — Node screens only' }}


I'm not convinced with this either...any better messaging which would help hre? @janhoy

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

janhoy · 2026-10-20T11:30:31Z

@dsmiley Do you feel strongly about this vs your approach in #5112 ?

David's more generic solution would proxy individual requests rather than aggregate, and would require the Admin UI to send N individual requests to the localhost:8983/solr/admin/foo endpoint with a header X-Solr-targetNode: otherNode3:8983_solr.

What I like the most about the ServletFilter approach is that the response shape stays the same and is thus more true to REST / OpenAPI. I.e. AdminUI can use a generated V2 API class to talk to logging / threads / xxx endpoint and get the response as an object. Less special code in UI, and less special code in Solr.

What I like with the current PR is that it is ready, mergable and re-uses the same mechanism already used in AdminUI. It could ship in 10.2 and a refactor to X-Solr-targetNode could ship in a later version.

dsmiley · 2026-10-20T17:43:36Z

I feel strongly in favor of the generic approach for the reasons you stated. I think it's also less code to maintain in the long run once the former mechanism can be removed. I'm ready to pursue my draft PR #5112 further... I was seeking feedback overall.

LoggingController's log-message-history screen already followed NodeTarget, but LoggingLevelController's listAllLoggersAndLevels call never did, even though the backend endpoint already accepts nodes= (added by this same PR). Picking a remote node had no effect on the Level tree, silently showing local data while every other node-scoped screen correctly switched. Also fixes isNodeScopedPage's page-name regex in app.js, which recognized 'logging' (the history screen) but not 'logging-levels' (the Level screen), so the header's selected-node badge never rendered there even once the data was correctly node-scoped. Adds testLoggingLevelsScreenFollowsSelectedNode to close the test gap.

Backend (reuse + altitude, confirmed by independent review agents): - Add NodeProxyingJerseyResponse, housing the remoteNodeData field and its @JsonAnyGetter/@JsonAnySetter pair that CoreStatusResponse, LoggingResponse, NodePropertiesResponse, and NodeThreadsResponse each carried as identical copies. They now extend it instead of SolrJerseyResponse directly (ListLevelsResponse/LogMessagesResponse get it for free via their existing LoggingResponse parent). - Add V2SolrRequestBasedProxy.proxyToNodes(CoreContainer, SolrRequest, NodeProxyingJerseyResponse), a generic static helper replacing five near-identical private proxy methods in CoreStatus, GetNodeProperties, NodeLogging (x2), and NodeThreadsAPI. Also drops CoreStatus's stray extra nodes-null/empty guard, which was inconsistent with the other four call sites and already redundant (proxyRequest() already no-ops via shouldProxy() when nodes is unset). Frontend: - services.js: NodeTarget.unwrap()'s data.remoteNodeData[...] fallback branch was dead - confirmed empirically (a live 2-node cluster's raw JSON response) that @JsonAnyGetter flattens remoteNodeData's entries to the top level, so a literal 'remoteNodeData' key never appears on the wire; the body[selectedNode] branch above it is what actually matches. - app.js: resetMenu() fetched core status eagerly, then a second time after listClusterNodes resolved the selected node in cloud mode, discarding the first result; the eager call is now skipped once isCloudEnabled is known true. onSelectedNodeChange() also fetched cores manually right before .reload(), which re-fetches them anyway via resetMenu() before anything renders. Verified with the existing test suites (no behavior change): backend NodeAdminProxySolrCloudTest, NodeLoggingAPITest, ThreadDumpHandlerTest; frontend AdminUiNodePickerTest, AdminUiCoreAdminStandaloneTest, plus a broader Selenium sweep (AdminUiDashboardTest, AdminUiCoreAdminScreenTest, AdminUiLoggingScreenTest, AdminUiLoggingStandaloneTest, AdminUiNodeScreensTest, AdminUiCollectionsScreenTest, AdminUiSmokeTest) since resetMenu/onSelectedNodeChange are shared by every page.

epugh · 2026-10-21T17:20:58Z

Poking more at this... I don't think we need the "this node" text:

and in fact I would just use this styling for any node:

cause after I get over the "hey, this is so cool I can connect any node", I don't actually care that it's "this node" or "remote node"! If you are a long time solr users you are excited. a new user is like, of course i can connect to any node.

epugh · 2026-10-21T17:21:49Z

SO I also think in the node selection we don't even need the text:

I would drop the Remote node (Node screens only) and his node (Node screens only) text.

epugh · 2026-10-21T17:23:01Z

This also makes me wonder if we need this duplicated gray text:

epugh · 2026-10-21T17:24:55Z

@iprithv can you review my two commits?

iprithv · 2026-10-22T19:01:04Z

I was checking with some production scenarios in mind and i saw these two issues. I tried setting hostnames longer as in prod and this happens in that case.

iprithv · 2026-10-22T19:03:15Z

I fixed the issue by adding horizontal scroll to both and fixed length of outline for these two

iprithv · 2026-10-22T19:04:13Z

also removed the duplicate grey node and "this node" tag :)

epugh · 2026-10-22T19:13:28Z

nice...

dsmiley · 2026-10-22T20:29:34Z

@epugh -- be aware that the implications of Jan and I preferring a generic proxy (#5112 coming soon; tests pass) means that much of the LOC here shouldn't be committed as-such.

epugh · 2026-10-22T21:08:48Z

@epugh -- be aware that the implications of Jan and I preferring a generic proxy (#5112 coming soon; tests pass) means that much of the LOC here shouldn't be committed as-such.

It's a race! Nothing in this UI is landing until 10.2, so really no hurry.. If #5112 stalls out, then we can evaluate merging htis.

nick-boss-tech · 2026-10-25T02:14:06Z

AI Review:
Three P2 findings:

Silent remote failures: The new proxy helper drops failedNodes, so failed reads can appear as successful empty results.
Wrong error status: Its catch-all handler converts deliberate 400 errors for invalid/non-live nodes into 500s.
Permission-dependent navigation: Once cloud mode is known, a failed live-node lookup skips core-menu refresh. Users with core-read permission but without collection-admin-read can see stale core information.
The earlier wrong-node mutation and session-restoration findings have fixes now. Maintainers also prefer SOLR-18537: Proxy requests to a node via X-Solr-targetNode #5112’s generic transport, keeping this approach as a fallback.

dsmiley · 2026-10-29T19:35:19Z

Wouldn't it be reasonable for Solr to configure CORS? Granted, it's a dev-list discussion...

janhoy · 2026-10-29T21:42:19Z

Solr does not necessarily know the public host name (proxy etc) that the admin is served from, whether it is http or https (could be behind an ingress or WAF), etc, so CORS is not fun. Proxying is an elegant solution to the design-flaw that we don’t have a separate BFF for our admin.

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

epugh · 2026-11-04T16:09:31Z

-The first set of links are for system-level information and configuration and provide access to xref:deployment-guide:configuring-logging.adoc#logging-screen[Logging Screen], xref:deployment-guide:collections-core-admin.adoc[], and xref:deployment-guide:jvm-settings.adoc#java-properties-screen[Java Properties Screen], among other things.
+The first set of links is split into Cluster (SolrCloud) and Node sections.
+On SolrCloud, a Node picker chooses which live node Dashboard, Logging, Java Properties, Thread Dump, and Cores show.
+Those screens are served from the node hosting the UI and routed with the `X-Solr-targetNode` header.


i don't think we need to explain the X-Sorl bit.. users don't care.

sure, removed :)

epugh · 2026-11-04T16:11:43Z


+      function isNodeScopedUrl(url) {
+        url = url || '';
+        return /\/api\/node\/(system|threads|properties|logging\/messages)(?:\?|$)/.test(url)


just double check this line!

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

dsmiley

I think this PR should purely be about the front-end, powered by the X-Solr-targetNode header. No changes to v2 API etc.

dsmiley · 2026-11-05T02:01:42Z

+            "Fetch status info for all cores hosted on this node, or on other live nodes when 'nodes' is set.",
+        tags = "cores")
+    CoreStatusResponse getAllCoreStatus(
+        @QueryParam("indexInfo") Boolean indexInfo, @QueryParam("nodes") String nodes)


please revert "nodes" params from v2

yeah makes sense. dropped. thanks!

just to make sure I'm keeping up... With the new X-Solr-targetNode we no longer need or want the nodes param right? And it got added in this PR to make some of the plumbing work, but wiht the new header, we can now remove that plumbing, and that simplifies our V2 api as well...

yes exactly. It becomes deprecated stuff we don't want to v2-enable.

Great... I'll leave this open till friday and merge... or if I am bored and walking the dog and looking at approved PR's that just need a merge ;-)

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

dsmiley

Approving because my concern was fully addressed. But I did not review what remains here! I leave that assessment to Eric/others. I loved the video Eric shared!

epugh

LGTM

dsmiley · 2026-11-05T21:01:08Z

Thanks for this Prithvi; this is a very useful Admin UI feature! I'm glad I could provide the infrastructure below that made it possible -- good collaboration :-)

(cherry picked from commit 0d40291)

github-actions Bot added admin-ui tests cat:api labels Oct 12, 2026

Admin UI: node picker with cross-node proxy for node-local screens an…

fc0b096

…d Cluster/Node sidebar. Signed-off-by: prithvi <prithvisivasankar@gmail.com>

iprithv force-pushed the admin-ui-node-picker branch from 4915123 to fc0b096 Compare October 12, 2026 14:41

iprithv added 2 commits October 12, 2026 16:08

Add changelog and fix Spotless formatting for node picker PR.

d6b57fd

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

Fix Admin UI collection selector Chosen rebind TypeErrors in Selenium…

652eed6

… tests. Signed-off-by: prithvi <prithvisivasankar@gmail.com>

iprithv changed the title ~~node picker for cross-node screens~~ SOLR-12613: [HACKATHON] node picker for cross-node screens Oct 12, 2026

iprithv changed the title ~~SOLR-12613: [HACKATHON] node picker for cross-node screens~~ SOLR-12613: node picker for cross-node screens Oct 12, 2026

janhoy self-requested a review October 12, 2026 18:24

janhoy requested a balanced review from Copilot October 12, 2026 18:25

Copilot started reviewing on behalf of janhoy October 12, 2026 18:26

View session

Copilot AI reviewed Oct 12, 2026

View reviewed changes

janhoy requested a balanced review from Copilot October 12, 2026 21:54

Copilot AI reviewed Oct 12, 2026

iprithv commented Oct 12, 2026

View reviewed changes

review chnge

996861b

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

iprithv force-pushed the admin-ui-node-picker branch from 2365a02 to 996861b Compare October 12, 2026 22:28

janhoy requested a review from dsmiley October 20, 2026 11:20

epugh added 2 commits October 21, 2026 12:58

review changes and few tweaks

30d5229

iprithv added 2 commits November 4, 2026 19:32

Merge remote-tracking branch 'apache/main' into admin-ui-node-picker

bb5e72c

updated with pr 5112

0a03be4

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

github-actions Bot added the documentation Improvements or additions to documentation label Nov 4, 2026

epugh reviewed Nov 4, 2026

View reviewed changes

iprithv added 2 commits November 4, 2026 21:56

review change

f764fb5

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

Land on cluster nodes and empty Node Selector until picked.

73b3095

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

iprithv force-pushed the admin-ui-node-picker branch from bf4b115 to 73b3095 Compare November 4, 2026 19:16

dsmiley requested changes Nov 5, 2026

View reviewed changes

Revert v2 nodes params; Admin UI uses X-Solr-targetNode only.

6b5d830

Signed-off-by: prithvi <prithvisivasankar@gmail.com>

github-actions Bot removed the cat:api label Nov 5, 2026

iprithv requested review from dsmiley and epugh November 5, 2026 12:33

dsmiley approved these changes Nov 5, 2026

View reviewed changes

epugh self-assigned this Nov 5, 2026

epugh added this to the 10.x milestone Nov 5, 2026

epugh approved these changes Nov 5, 2026

View reviewed changes

epugh merged commit 0d40291 into apache:main Nov 6, 2026
5 checks passed

dsmiley pushed a commit that referenced this pull request Nov 10, 2026

SOLR-12613: node picker for cross-node screens (#5110)

d6f2032

(cherry picked from commit 0d40291)

Conversation

iprithv commented Oct 12, 2026 • edited by epugh Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iprithv commented Oct 12, 2026

Uh oh!

janhoy commented Oct 12, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

iprithv commented Oct 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

janhoy commented Oct 20, 2026

Uh oh!

dsmiley commented Oct 20, 2026

Uh oh!

epugh commented Oct 21, 2026

Uh oh!

epugh commented Oct 21, 2026

Uh oh!

epugh commented Oct 21, 2026

Uh oh!

epugh commented Oct 21, 2026

Uh oh!

iprithv commented Oct 22, 2026

Uh oh!

iprithv commented Oct 22, 2026

Uh oh!

iprithv commented Oct 22, 2026

Uh oh!

epugh commented Oct 22, 2026

Uh oh!

dsmiley commented Oct 22, 2026

Uh oh!

epugh commented Oct 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nick-boss-tech commented Oct 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dsmiley commented Oct 29, 2026

Uh oh!

janhoy commented Oct 29, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsmiley left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsmiley left a comment

Choose a reason for hiding this comment

Uh oh!

epugh left a comment

Choose a reason for hiding this comment

iprithv commented Oct 12, 2026 •

edited by epugh

Loading

epugh commented Oct 22, 2026 •

edited

Loading

nick-boss-tech commented Oct 25, 2026 •

edited

Loading