SOLR-18320: Use Configsets V2 API instead of direct ZooKeeper access in bin/solr create by epugh · Pull Request #4672 · apache/solr

epugh · 2026-07-26T16:32:13Z

Summary

bin/solr create previously uploaded configsets by opening a direct ZooKeeper connection (ZkConfigSetService) and reading /configs/<name> directly to check for an existing configset. It now does both via the Configsets V2 API (ConfigsetsApi.ListConfigSet / ConfigsetsApi.UploadConfigSet), zipping the local configset directory for upload.
createCollection/createCore now just take a SolrClient rather than requiring a CloudSolrClient built from a ZooKeeper connection string. The only remaining ZK-specific step is resolving a live node's URL when the user only supplies --zk-host (no --solr-url) — done once via CLIUtils.normalizeSolrUrl.

Test plan

CreateToolTest passes, including a new testCreateCollectionUploadsNewConfigSet test that exercises the fresh-upload path (not just the reuse-existing-configset path the original test covered)
./gradlew :solr:core:spotlessJavaCheck clean
./gradlew :solr:core:compileJava :solr:core:compileTestJava clean

🤖 Generated with Claude Code

…when uploading a configset in bin/solr create. createCollection/createCore now just take a SolrClient; the only remaining ZK-specific step is resolving a live node's URL when only --zk-host is given. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

dsmiley

Thanks for addressing this Eric :-)

dsmiley · 2026-07-27T12:46:51Z


  @Override
  public void runImpl(CommandLine cli) throws Exception {
    try (var solrClient = CLIUtils.getSolrClient(cli)) {


You could use CLIUtils.getCloudSolrClient(zkSolrConnection, builder) here...

dsmiley · 2026-07-27T12:47:31Z

-        createCollection(cli);
+        createCollection(cli, solrClient);
      } else {
        createCore(cli, solrClient);


... and if the mode isn't actually cloud then at this line call cloudSolrClient.getHttpSolrClient().

Copilot

Pull request overview

This PR updates bin/solr create to avoid direct ZooKeeper configset access by switching configset existence checks and uploads over to the Configsets V2 API, while also simplifying collection/core creation code paths to work with a generic SolrClient.

Changes:

Replace direct ZooKeeper /configs/<name> existence checks + ZkConfigSetService uploads with Configsets V2 API ListConfigSet + UploadConfigSet.
Refactor createCollection to accept SolrClient (instead of building a dedicated CloudSolrClient from --zk-host).
Add a new CLI test intended to cover the “upload new configset” path, plus a changelog entry.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
solr/core/src/java/org/apache/solr/cli/CreateTool.java	Switch configset existence + upload to Configsets V2 API and add local configset zipping helper for upload.
solr/core/src/test/org/apache/solr/cli/CreateToolTest.java	Add a test case for creating a collection that should upload a previously-nonexistent configset.
changelog/unreleased/SOLR-18320-skip-zk-for-configset-upload.yml	Document the behavioral change in `bin/solr create` regarding configset uploads.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…is here, its for uploading the configset.

epugh · 2026-07-28T17:05:26Z

Okay, pending clean run of tests, this is done.

github-actions · 2026-09-27T00:20:05Z

This PR has had no activity for 60 days and is now labeled as stale. Any new activity will remove the stale label. To attract more reviewers, please tag people who might be familiar with the code area and/or notify the dev@solr.apache.org mailing list. To exempt this PR from being marked as stale, make it a draft PR or add the label "exempt-stale". If left unattended, this PR will be closed after another 60 days of inactivity. Thank you for your contribution!

epugh · 2026-09-27T18:22:39Z

Okay, pending tests passing I will merge this on Monday.

Review feedback: CreateTool (a client) shouldn't reach into solr/core's ConfigSetService to zip a directory, and it's not the client's place to enforce which file types are forbidden in configsets anyway — that's a server concern. Move zipDirectory into SolrJ's Utils without the validateFileTypes/isFileForbiddenInConfigSets check, and update CreateTool and DownloadConfigSet to call it there. Server-side forbidden-file-type enforcement is unaffected and still covered by TestConfigSetsAPI. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HaP4sXv7KQBw9ZEqtvwug2

RemoteSolrBackend had its own bespoke directory-to-zip-file helper duplicating what just moved to SolrJ's Utils.zipDirectory. Delegate to it instead of maintaining a second implementation. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HaP4sXv7KQBw9ZEqtvwug2

Explored migrating this onto the same V2 API path CreateTool now uses (SOLR-18320), but ZkSubcommandsTest.testUpConfigDownConfigClearZk exposed why that's wrong: this command must work against a bare ZooKeeper ensemble with no Solr node running yet, and the V2 API requires an HTTP endpoint on an already-running node. Leaving the direct-ZK path in place and documenting why, so the divergence from CreateTool isn't mistaken for an oversight. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HaP4sXv7KQBw9ZEqtvwug2

# Conflicts: # solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java # solr/core/src/java/org/apache/solr/cli/CreateTool.java

github-actions Bot added tests cat:cli labels Jul 26, 2026

epugh added the no-changelog label Jul 26, 2026

epugh requested a review from dsmiley July 26, 2026 16:55

epugh removed the no-changelog label Jul 26, 2026

epugh commented Jul 26, 2026

View reviewed changes

Comment thread solr/core/src/java/org/apache/solr/cli/CreateTool.java Outdated

dsmiley reviewed Jul 27, 2026

View reviewed changes

epugh requested a review from Copilot July 28, 2026 16:32

Copilot started reviewing on behalf of epugh July 28, 2026 16:32

View session

Copilot AI reviewed Jul 28, 2026

View reviewed changes

Comment thread solr/core/src/test/org/apache/solr/cli/CreateToolTest.java

Comment thread solr/core/src/java/org/apache/solr/cli/CreateTool.java Outdated

epugh added 3 commits July 28, 2026 13:40

don't tie commment to specific api, but still leave in why we have th…

20f7641

…is here, its for uploading the configset.

Tighten up logic on what gets put into a configset.

7fc5b08

Pull all the various configset zipping methods into one helper.

adda596

epugh requested a review from dsmiley July 28, 2026 17:05

epugh added this to the 10.x milestone Jul 28, 2026

dsmiley reviewed Jul 28, 2026

View reviewed changes

Comment thread solr/core/src/java/org/apache/solr/core/ConfigSetService.java Outdated

Comment thread solr/core/src/java/org/apache/solr/core/ConfigSetService.java

epugh mentioned this pull request Jul 30, 2026

Extract CLIUtils.solrUrlFromConnection() from normalizeSolrUrl(CommandLine) #4683

Merged

github-actions Bot added the stale PR not updated in 60 days label Sep 27, 2026

epugh added 2 commits September 27, 2026 11:01

Merge remote-tracking branch 'upstream/main' into SOLR-18320

a069882

It's not an IO error it's a bad argument error!

9b5d91d

epugh removed the stale PR not updated in 60 days label Sep 27, 2026

dsmiley reviewed Sep 27, 2026

View reviewed changes

Comment thread solr/core/src/java/org/apache/solr/cli/CreateTool.java Outdated

Comment thread solr/core/src/java/org/apache/solr/core/ConfigSetService.java

epugh and others added 4 commits September 27, 2026 15:24

Merge remote-tracking branch 'upstream/main' into SOLR-18320

da38feb

dead code

538e93b

pass url around so we don't recrate client twice

31b7432

epugh and others added 3 commits September 27, 2026 20:46

Merge branch 'main' into SOLR-18320

c74b209

# Conflicts: # solr/core/src/java/org/apache/solr/cli/ConfigSetUploadTool.java # solr/core/src/java/org/apache/solr/cli/CreateTool.java

github-actions Bot added test-framework client:solrj cat:cloud labels Oct 28, 2026

Apply tidy formatting to merge-resolved ConfigSetUploadTool javadoc

e9c78b4

epugh merged commit 8cba5bf into apache:main Oct 28, 2026
6 checks passed

epugh mentioned this pull request Oct 28, 2026

SOLR-18320 follow-up: streaming zipDirectory, drop dead passthrough wrapper #5260

Open

4 tasks done

Navigation Menu

Repository navigation

SOLR-18320: Use Configsets V2 API instead of direct ZooKeeper access in bin/solr create - #4672

SOLR-18320: Use Configsets V2 API instead of direct ZooKeeper access in bin/solr create#4672
epugh merged 14 commits into
apache:mainfrom
epugh:SOLR-18320

epugh commented Jul 26, 2026

Uh oh!

Uh oh!

dsmiley left a comment

Uh oh!

dsmiley Jul 27, 2026

Uh oh!

dsmiley Jul 27, 2026

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

epugh commented Jul 28, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Sep 27, 2026

Uh oh!

epugh commented Sep 27, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

epugh commented Jul 26, 2026

Summary

Test plan

Uh oh!

Uh oh!

dsmiley left a comment

Choose a reason for hiding this comment

Uh oh!

dsmiley Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

dsmiley Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

epugh commented Jul 28, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Sep 27, 2026

Uh oh!

epugh commented Sep 27, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants