From 24b9f49af6e87df3f4b8fbbf6356ed6c13c1bfcb Mon Sep 17 00:00:00 2001 From: Serhiy Bzhezytskyy Date: Tue, 13 Oct 2026 15:13:16 +0300 Subject: [PATCH 1/3] SOLR-18526: Use "user-managed" for the mode and fix the start commands Since Solr 10 a bare `bin/solr start` starts SolrCloud, so the SSL page's user-managed example needs `--user-managed`; `solr.cmd` ignores a command that does not begin with `start`. The mode was also called "standalone" and "User Managed" in places; the guide's own cluster-types page names it user-managed. --- .../configuration-guide/pages/config-api.adoc | 2 +- .../pages/configuring-solr-xml.adoc | 2 +- .../pages/system-info-handler.adoc | 2 +- ...hentication-and-authorization-plugins.adoc | 2 +- .../pages/cli/solr-create.adoc | 2 +- .../pages/cli/solr-delete.adoc | 2 +- .../pages/cli/solr-start.adoc | 4 ++-- .../deployment-guide/pages/enabling-ssl.adoc | 8 ++++---- .../pages/metrics-reporting.adoc | 2 +- .../deployment-guide/pages/security-ui.adoc | 2 +- .../pages/solr-control-script-reference.adoc | 10 +++++----- .../pages/solr-in-docker.adoc | 2 +- .../pages/user-managed-index-replication.adoc | 2 +- .../getting-started/pages/cluster-types.adoc | 2 +- ...transforming-and-indexing-custom-json.adoc | 20 +++++++++---------- .../pages/json-combined-query-dsl.adoc | 4 ++-- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc index f01f882a0d03..f126c66aa2df 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc @@ -19,7 +19,7 @@ The Config API enables manipulating various aspects of your `solrconfig.xml` using REST-like API calls. -This feature is enabled by default and works similarly in both SolrCloud and user-managed clusters installations. +This feature is enabled by default and works similarly in both SolrCloud and user-managed clusters. Many commonly edited properties (such as cache sizes and commit settings) and request handler definitions can be changed with this API. When using this API, `solrconfig.xml` is not changed. diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc index bc22a2ed2f51..d9f05ead49cd 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc @@ -284,7 +284,7 @@ If you need to disable this feature for backwards compatibility, you can set the + Comma-separated list of ZooKeeper connection strings of other SolrCloud clusters that may be passed as a `zkHost` (or ZooKeeper-based `solrConnection`) parameter to features that fetch data from another cluster, such as cross-collection join and streaming expressions. The local SolrCloud ZooKeeper ensemble is always allowed and need not be listed. -Solr in standalone (non-SolrCloud) mode does not allow any `zkHost`. +Solr in user-managed (non-SolrCloud) mode does not allow any `zkHost`. + Matching is character-for-character against the full connection string -- e.g. `zk1:2181,zk2:2181,zk3:2181/solr` is a different value from `zk1:2181,zk2:2181,zk3:2181` or from the same hosts in a different order. The local ensemble's value includes any chroot suffix configured at startup: if Solr was started with `-DzkHost=zk1:2181/solr`, then `zkHost="zk1:2181/solr"` is allowed but `zkHost="zk1:2181"` is not unless listed. diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc index 5fe1359e2e7c..1c6a2dc1a550 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc @@ -49,7 +49,7 @@ http://localhost:8983/api/node/system The keys in the result are: `mode`:: -Either `solrcloud` or `std`, indicating the mode Solr is running in standalone mode. +Either `solrcloud` or `std`, indicating the mode Solr is running in; `std` is user-managed mode. `solr_home`:: Solr base directory. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc index 61abd3fc8a75..91c431d9dbe7 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc @@ -28,7 +28,7 @@ Solr includes some plugins out of the box, and additional plugins can be develop All authentication, authorization and audit logging plugins can work with Solr whether it is running as a cluster or standalone installation. All related configuration, including users and permission rules, are stored in a file named `security.json`. When using SolrCloud, this file must be located at the chroot of the ZooKeeper structure. If no chroot was given, then it must be at the root. -When running Solr in standalone mode (without ZooKeeper), this file must be in the `$SOLR_HOME` directory. When manually running Solr from an extracted archive, this will most likely be `server/solr`. If the service installer script is used, its default location will be `/var/solr/data`, which can be changed with options given to the service installer. +When running Solr in user-managed mode (without ZooKeeper), this file must be in the `$SOLR_HOME` directory. When manually running Solr from an extracted archive, this will most likely be `server/solr`. If the service installer script is used, its default location will be `/var/solr/data`, which can be changed with options given to the service installer. == Configuring security.json diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc index a584a9c55656..1eb41df7d401 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc @@ -43,7 +43,7 @@ bin/solr create [-hv] -c= [-d=] [-n=] // tag::picocli-generated-man-section-description[] == Description -Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection). +Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection). // end::picocli-generated-man-section-description[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc index 8ee0fa65e14a..b27f586ed957 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc @@ -42,7 +42,7 @@ bin/solr delete [-fhv] [--delete-config] -c= [-u=] // tag::picocli-generated-man-section-description[] == Description -Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode. +Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode. // end::picocli-generated-man-section-description[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc index a6ba0f61c2bb..6060660ffd30 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc @@ -98,7 +98,7 @@ Starts Solr Set solr.solr.home system property; default is 'server/solr'. Ignored in examples mode *--user-managed*:: - Start Solr in standalone mode. Default is SolrCloud (ZooKeeper) mode. + Start Solr in user-managed mode. Default is SolrCloud (ZooKeeper) mode. *--verbose*:: Set log level to DEBUG (verbose); default is INFO @@ -122,7 +122,7 @@ Starts Solr bin/solr start -p 8984 -m 2g [%hardbreaks] - # Start in user managed mode + # Start in user-managed mode bin/solr start --user-managed // end::picocli-generated-man-section-footer[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc index 27b02b71415e..ca03c48e8a7e 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc @@ -159,13 +159,13 @@ Windows:: ==== [source,powershell] ---- -bin\solr.cmd --solr-home cloud\node1 -z server1:2181,server2:2181,server3:2181 +bin\solr.cmd start --solr-home cloud\node1 -z server1:2181,server2:2181,server3:2181 ---- ==== ====== -=== Start User-Managed Cluster or Standalone Solr +=== Start a User-Managed Cluster or Standalone Installation Start Solr using the Solr control script as shown in the examples below. Customize the values for the parameters shown as needed and add any used in your system. @@ -177,7 +177,7 @@ Customize the values for the parameters shown as needed and add any used in your ==== [source,bash] ---- -bin/solr start -p 8984 +bin/solr start --user-managed -p 8984 ---- ==== @@ -186,7 +186,7 @@ Windows:: ==== [source,powershell] ---- -bin\solr.cmd -p 8984 +bin\solr.cmd start --user-managed -p 8984 ---- ==== ====== diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc index 880359491fd0..86cea547be1a 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc @@ -68,7 +68,7 @@ The type of replica. This can be NRT/TLOG/PULL. `shard`:: The name of the shard. -In standalone mode, only the `core` attribute is attached to the metrics. +In user-managed mode, only the `core` attribute is attached to the metrics. Some examples of metrics available from the core registry: diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc index 4691083f7df3..9b55544ff330 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc @@ -18,7 +18,7 @@ // under the License. The Security screen allows administrators with the `security-edit` permission to manage users, roles, and permissions. -The Security screen works with Solr running in cloud and standalone modes. +The Security screen works with Solr running in SolrCloud and user-managed modes. .Security Screen image::getting-started:solr-admin-ui/security.png[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc index de678a1c1207..838cee0fe781 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc @@ -96,9 +96,9 @@ In most cases, you should wrap the additional parameters in double quotes. |Optional |Default: none |=== + -Start Solr in User Managed mode (AKA Standalone mode). This is the style of Solr that supports only cores, not collections. +Start Solr in user-managed mode (also called standalone mode). This is the style of Solr that supports only cores, not collections. + -For more details, see the section <> below. +For more details, see the section <> below. + *Example*: `bin/solr start --user-managed` @@ -344,9 +344,9 @@ When starting in SolrCloud mode, the interactive script session will prompt you For more information about starting Solr in SolrCloud mode, see also the section xref:getting-started:tutorial-solrcloud.adoc[]. -==== User Managed Mode +==== User-Managed Mode -`bin/solr start --user-managed` starts Solr in User Managed mode (AKA Standalone mode). This was the default mode up until Solr 10x. +`bin/solr start --user-managed` starts Solr in user-managed mode (also called standalone mode). This was the default mode up until Solr 10x. For more information about the different modes, see the section xref:getting-started:cluster-types.adoc[]. @@ -933,7 +933,7 @@ For Basic Authentication the script provides https://github.com/apache/solr/blob The command `bin/solr auth enable` configures Solr to use Basic Authentication when accessing the User Interface, using `bin/solr` and any API requests. NOTE: This command currently requires SolrCloud mode — it uploads the generated `security.json` to ZooKeeper so that all nodes pick it up automatically. -For user-managed (standalone) clusters, you must create the `security.json` file manually and place it in each node's Solr home directory. +For user-managed clusters or standalone installations, you must create the `security.json` file manually and place it in each node's Solr home directory. See xref:basic-authentication-plugin.adoc[] for details. TIP: For more information about Solr's authentication plugins, see the section xref:securing-solr.adoc[]. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc index d819053f401a..3b590adc77ce 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc @@ -188,7 +188,7 @@ You can use the xref:solr-control-script-reference.adoc#upload-a-configuration-s === Creating Cores -When Solr runs in standalone mode, you create "cores" to store data. +When Solr runs in user-managed mode, you create "cores" to store data. On a non-Docker Solr, you would run the server in the background, then use the xref:solr-control-script-reference.adoc[Solr control script] to create cores and load data. With Solr docker you have various options. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adoc index 259ce3d04309..7ed99473ac18 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/user-managed-index-replication.adoc @@ -1,4 +1,4 @@ -= User-Managed Index Replication Index Replication += User-Managed Index Replication // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information diff --git a/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc b/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc index fd1bd3608bd6..1a05e1434457 100644 --- a/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc +++ b/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc @@ -21,7 +21,7 @@ A Solr cluster is a group of servers that each run one or more Solr _nodes_. There are two general modes of operating a cluster of Solr nodes. One mode provides central coordination of the Solr nodes (<>), while the other allows you to operate a cluster without this central coordination (<>). -TIP: "User Managed" is sometimes referred to as "Standalone" in source code. +TIP: "User-managed" is sometimes referred to as "Standalone" in source code. Both modes share general concepts, but ultimately differ in how those concepts are reflected in functionality and features. diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc index 3a4fc8c081a6..235058eaf02f 100644 --- a/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc +++ b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc @@ -134,7 +134,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -261,7 +261,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -359,7 +359,7 @@ V1 API:: ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -416,7 +416,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs?useParams=my_para ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -513,7 +513,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -602,7 +602,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -690,7 +690,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs?split=/exams'\ ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -780,7 +780,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs' -H 'Content-type ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -818,7 +818,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs' -H 'Content-type ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] @@ -894,7 +894,7 @@ V1 API:: ---- ==== -V2 API User-Managed / Standalone Solr:: +V2 API User-Managed:: + ==== [source,bash] diff --git a/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc index 33f841cd2cc6..4a62c8e72cb6 100644 --- a/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc +++ b/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc @@ -27,8 +27,8 @@ This feature is currently unsupported for grouping and Cursors. [IMPORTANT] ==== -This feature works in both Standalone and SolrCloud modes and always performs distributed search execution. -In Standalone (user-managed) mode, shard URLs must be explicitly allow-listed using the *allowUrls* parameter, otherwise Solr returns HTTP 403. For example: +This feature works in both user-managed and SolrCloud modes and always performs distributed search execution. +In user-managed mode, shard URLs must be explicitly allow-listed using the *allowUrls* parameter, otherwise Solr returns HTTP 403. For example: ``` "-Dsolr.security.allow.urls=http://localhost:8983/solr/" From 163fd045467df7c85984ed1afc1fe59a2858b817 Mon Sep 17 00:00:00 2001 From: Serhiy Bzhezytskyy Date: Tue, 13 Oct 2026 19:26:18 +0300 Subject: [PATCH 2/3] Use user-managed in the CLI help the generated pages come from checkCliDocsUpToDate fails when the .adoc terminology differs from the picocli source. --- solr/core/src/java/org/apache/solr/cli/CreateTool.java | 4 ++-- solr/core/src/java/org/apache/solr/cli/DeleteTool.java | 4 ++-- solr/core/src/java/org/apache/solr/cli/StartCommand.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java index 58149b974757..79e69c92191f 100644 --- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java +++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java @@ -47,7 +47,7 @@ @picocli.CommandLine.Command( name = "create", description = - "Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection).", + "Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection).", exitCodeListHeading = "%nExit Codes:%n", exitCodeList = { "0:Collection or core created successfully.", @@ -180,7 +180,7 @@ public String getName() { @Override public String getHeader() { return """ - Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection). + Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection). If you are using standalone mode you must run this command on the Solr server itself. List of options:"""; diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java index 15ca84581f10..ab054866d3fe 100644 --- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java +++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java @@ -36,7 +36,7 @@ @picocli.CommandLine.Command( name = "delete", description = - "Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode.", + "Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode.", exitCodeListHeading = "%nExit Codes:%n", exitCodeList = { "0:Collection or core deleted successfully.", @@ -136,7 +136,7 @@ public String getName() { @Override public String getHeader() { return """ - Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode. \ + Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode. \ Deleting a collection does not delete it's configuration unless you pass in the --delete-config flag. List of options:"""; diff --git a/solr/core/src/java/org/apache/solr/cli/StartCommand.java b/solr/core/src/java/org/apache/solr/cli/StartCommand.java index 5af9b497aa81..815aa15b568f 100644 --- a/solr/core/src/java/org/apache/solr/cli/StartCommand.java +++ b/solr/core/src/java/org/apache/solr/cli/StartCommand.java @@ -30,7 +30,7 @@ " # Start on a custom port with 2g heap", " bin/solr start -p 8984 -m 2g", "", - " # Start in user managed mode", + " # Start in user-managed mode", " bin/solr start --user-managed" }) public class StartCommand implements Callable { @@ -47,7 +47,7 @@ public class StartCommand implements Callable { @CommandLine.Option( names = "--user-managed", - description = "Start Solr in standalone mode. Default is SolrCloud (ZooKeeper) mode.") + description = "Start Solr in user-managed mode. Default is SolrCloud (ZooKeeper) mode.") boolean userManaged; @CommandLine.Option( From 0c43f2b1662cb55c6dff7c8803ea16856f554189 Mon Sep 17 00:00:00 2001 From: Serhiy Bzhezytskyy Date: Wed, 21 Oct 2026 15:37:20 +0300 Subject: [PATCH 3/3] SOLR-18526: Fix the start commands in the SSL guide The Windows examples left out the start subcommand, which bin\solr.cmd requires, and the standalone example started SolrCloud because it lacked --user-managed. --- .../java/org/apache/solr/cli/CreateTool.java | 4 ++-- .../java/org/apache/solr/cli/DeleteTool.java | 4 ++-- .../org/apache/solr/cli/StartCommand.java | 4 ++-- .../configuration-guide/pages/config-api.adoc | 2 +- .../pages/configuring-solr-xml.adoc | 2 +- .../pages/system-info-handler.adoc | 2 +- ...hentication-and-authorization-plugins.adoc | 2 +- .../pages/cli/solr-create.adoc | 2 +- .../pages/cli/solr-delete.adoc | 2 +- .../pages/cli/solr-start.adoc | 4 ++-- .../deployment-guide/pages/enabling-ssl.adoc | 2 +- .../pages/metrics-reporting.adoc | 2 +- .../deployment-guide/pages/security-ui.adoc | 2 +- .../pages/solr-control-script-reference.adoc | 10 +++++----- .../pages/solr-in-docker.adoc | 2 +- .../getting-started/pages/cluster-types.adoc | 2 +- ...transforming-and-indexing-custom-json.adoc | 20 +++++++++---------- .../pages/json-combined-query-dsl.adoc | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java index 79e69c92191f..58149b974757 100644 --- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java +++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java @@ -47,7 +47,7 @@ @picocli.CommandLine.Command( name = "create", description = - "Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection).", + "Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection).", exitCodeListHeading = "%nExit Codes:%n", exitCodeList = { "0:Collection or core created successfully.", @@ -180,7 +180,7 @@ public String getName() { @Override public String getHeader() { return """ - Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection). + Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection). If you are using standalone mode you must run this command on the Solr server itself. List of options:"""; diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java index ab054866d3fe..15ca84581f10 100644 --- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java +++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java @@ -36,7 +36,7 @@ @picocli.CommandLine.Command( name = "delete", description = - "Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode.", + "Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode.", exitCodeListHeading = "%nExit Codes:%n", exitCodeList = { "0:Collection or core deleted successfully.", @@ -136,7 +136,7 @@ public String getName() { @Override public String getHeader() { return """ - Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode. \ + Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode. \ Deleting a collection does not delete it's configuration unless you pass in the --delete-config flag. List of options:"""; diff --git a/solr/core/src/java/org/apache/solr/cli/StartCommand.java b/solr/core/src/java/org/apache/solr/cli/StartCommand.java index 815aa15b568f..5af9b497aa81 100644 --- a/solr/core/src/java/org/apache/solr/cli/StartCommand.java +++ b/solr/core/src/java/org/apache/solr/cli/StartCommand.java @@ -30,7 +30,7 @@ " # Start on a custom port with 2g heap", " bin/solr start -p 8984 -m 2g", "", - " # Start in user-managed mode", + " # Start in user managed mode", " bin/solr start --user-managed" }) public class StartCommand implements Callable { @@ -47,7 +47,7 @@ public class StartCommand implements Callable { @CommandLine.Option( names = "--user-managed", - description = "Start Solr in user-managed mode. Default is SolrCloud (ZooKeeper) mode.") + description = "Start Solr in standalone mode. Default is SolrCloud (ZooKeeper) mode.") boolean userManaged; @CommandLine.Option( diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc index 9ee06f4c5e38..42e1f77c7945 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/config-api.adoc @@ -19,7 +19,7 @@ The Config API enables manipulating various aspects of your `solrconfig.xml` using REST-like API calls. -This feature is enabled by default and works similarly in both SolrCloud and user-managed clusters. +This feature is enabled by default and works similarly in both SolrCloud and user-managed clusters installations. Many commonly edited properties (such as cache sizes and commit settings) and request handler definitions can be changed with this API. When using this API, `solrconfig.xml` is not changed. diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc index d9f05ead49cd..bc22a2ed2f51 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/configuring-solr-xml.adoc @@ -284,7 +284,7 @@ If you need to disable this feature for backwards compatibility, you can set the + Comma-separated list of ZooKeeper connection strings of other SolrCloud clusters that may be passed as a `zkHost` (or ZooKeeper-based `solrConnection`) parameter to features that fetch data from another cluster, such as cross-collection join and streaming expressions. The local SolrCloud ZooKeeper ensemble is always allowed and need not be listed. -Solr in user-managed (non-SolrCloud) mode does not allow any `zkHost`. +Solr in standalone (non-SolrCloud) mode does not allow any `zkHost`. + Matching is character-for-character against the full connection string -- e.g. `zk1:2181,zk2:2181,zk3:2181/solr` is a different value from `zk1:2181,zk2:2181,zk3:2181` or from the same hosts in a different order. The local ensemble's value includes any chroot suffix configured at startup: if Solr was started with `-DzkHost=zk1:2181/solr`, then `zkHost="zk1:2181/solr"` is allowed but `zkHost="zk1:2181"` is not unless listed. diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc index 1c6a2dc1a550..592a6456f1f5 100644 --- a/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc +++ b/solr/solr-ref-guide/modules/configuration-guide/pages/system-info-handler.adoc @@ -49,7 +49,7 @@ http://localhost:8983/api/node/system The keys in the result are: `mode`:: -Either `solrcloud` or `std`, indicating the mode Solr is running in; `std` is user-managed mode. +Either `solrcloud` or `std`, indicating the mode Solr is running in; `std` is standalone mode. `solr_home`:: Solr base directory. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc index 91c431d9dbe7..61abd3fc8a75 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/authentication-and-authorization-plugins.adoc @@ -28,7 +28,7 @@ Solr includes some plugins out of the box, and additional plugins can be develop All authentication, authorization and audit logging plugins can work with Solr whether it is running as a cluster or standalone installation. All related configuration, including users and permission rules, are stored in a file named `security.json`. When using SolrCloud, this file must be located at the chroot of the ZooKeeper structure. If no chroot was given, then it must be at the root. -When running Solr in user-managed mode (without ZooKeeper), this file must be in the `$SOLR_HOME` directory. When manually running Solr from an extracted archive, this will most likely be `server/solr`. If the service installer script is used, its default location will be `/var/solr/data`, which can be changed with options given to the service installer. +When running Solr in standalone mode (without ZooKeeper), this file must be in the `$SOLR_HOME` directory. When manually running Solr from an extracted archive, this will most likely be `server/solr`. If the service installer script is used, its default location will be `/var/solr/data`, which can be changed with options given to the service installer. == Configuring security.json diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc index 1eb41df7d401..a584a9c55656 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-create.adoc @@ -43,7 +43,7 @@ bin/solr create [-hv] -c= [-d=] [-n=] // tag::picocli-generated-man-section-description[] == Description -Creates a core or collection depending on whether Solr is running in user-managed (core) or SolrCloud mode (collection). +Creates a core or collection depending on whether Solr is running in standalone (core) or SolrCloud mode (collection). // end::picocli-generated-man-section-description[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc index b27f586ed957..8ee0fa65e14a 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-delete.adoc @@ -42,7 +42,7 @@ bin/solr delete [-fhv] [--delete-config] -c= [-u=] // tag::picocli-generated-man-section-description[] == Description -Deletes a collection or core depending on whether Solr is running in SolrCloud or user-managed mode. +Deletes a collection or core depending on whether Solr is running in SolrCloud or standalone mode. // end::picocli-generated-man-section-description[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc index 6060660ffd30..a6ba0f61c2bb 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/cli/solr-start.adoc @@ -98,7 +98,7 @@ Starts Solr Set solr.solr.home system property; default is 'server/solr'. Ignored in examples mode *--user-managed*:: - Start Solr in user-managed mode. Default is SolrCloud (ZooKeeper) mode. + Start Solr in standalone mode. Default is SolrCloud (ZooKeeper) mode. *--verbose*:: Set log level to DEBUG (verbose); default is INFO @@ -122,7 +122,7 @@ Starts Solr bin/solr start -p 8984 -m 2g [%hardbreaks] - # Start in user-managed mode + # Start in user managed mode bin/solr start --user-managed // end::picocli-generated-man-section-footer[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc index 2320fc470966..229d0871a89d 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/enabling-ssl.adoc @@ -165,7 +165,7 @@ bin\solr.cmd start --solr-home cloud\node1 -z server1:2181,server2:2181,server3: ==== ====== -=== Start a User-Managed Cluster or Standalone Installation +=== Start User-Managed Cluster or Standalone Solr Start Solr using the Solr control script as shown in the examples below. Customize the values for the parameters shown as needed and add any used in your system. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc index 86cea547be1a..880359491fd0 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/metrics-reporting.adoc @@ -68,7 +68,7 @@ The type of replica. This can be NRT/TLOG/PULL. `shard`:: The name of the shard. -In user-managed mode, only the `core` attribute is attached to the metrics. +In standalone mode, only the `core` attribute is attached to the metrics. Some examples of metrics available from the core registry: diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc index 9b55544ff330..4691083f7df3 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/security-ui.adoc @@ -18,7 +18,7 @@ // under the License. The Security screen allows administrators with the `security-edit` permission to manage users, roles, and permissions. -The Security screen works with Solr running in SolrCloud and user-managed modes. +The Security screen works with Solr running in cloud and standalone modes. .Security Screen image::getting-started:solr-admin-ui/security.png[] diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc index 838cee0fe781..de678a1c1207 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc @@ -96,9 +96,9 @@ In most cases, you should wrap the additional parameters in double quotes. |Optional |Default: none |=== + -Start Solr in user-managed mode (also called standalone mode). This is the style of Solr that supports only cores, not collections. +Start Solr in User Managed mode (AKA Standalone mode). This is the style of Solr that supports only cores, not collections. + -For more details, see the section <> below. +For more details, see the section <> below. + *Example*: `bin/solr start --user-managed` @@ -344,9 +344,9 @@ When starting in SolrCloud mode, the interactive script session will prompt you For more information about starting Solr in SolrCloud mode, see also the section xref:getting-started:tutorial-solrcloud.adoc[]. -==== User-Managed Mode +==== User Managed Mode -`bin/solr start --user-managed` starts Solr in user-managed mode (also called standalone mode). This was the default mode up until Solr 10x. +`bin/solr start --user-managed` starts Solr in User Managed mode (AKA Standalone mode). This was the default mode up until Solr 10x. For more information about the different modes, see the section xref:getting-started:cluster-types.adoc[]. @@ -933,7 +933,7 @@ For Basic Authentication the script provides https://github.com/apache/solr/blob The command `bin/solr auth enable` configures Solr to use Basic Authentication when accessing the User Interface, using `bin/solr` and any API requests. NOTE: This command currently requires SolrCloud mode — it uploads the generated `security.json` to ZooKeeper so that all nodes pick it up automatically. -For user-managed clusters or standalone installations, you must create the `security.json` file manually and place it in each node's Solr home directory. +For user-managed (standalone) clusters, you must create the `security.json` file manually and place it in each node's Solr home directory. See xref:basic-authentication-plugin.adoc[] for details. TIP: For more information about Solr's authentication plugins, see the section xref:securing-solr.adoc[]. diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc index 3b590adc77ce..d819053f401a 100644 --- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc +++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-in-docker.adoc @@ -188,7 +188,7 @@ You can use the xref:solr-control-script-reference.adoc#upload-a-configuration-s === Creating Cores -When Solr runs in user-managed mode, you create "cores" to store data. +When Solr runs in standalone mode, you create "cores" to store data. On a non-Docker Solr, you would run the server in the background, then use the xref:solr-control-script-reference.adoc[Solr control script] to create cores and load data. With Solr docker you have various options. diff --git a/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc b/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc index 1a05e1434457..fd1bd3608bd6 100644 --- a/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc +++ b/solr/solr-ref-guide/modules/getting-started/pages/cluster-types.adoc @@ -21,7 +21,7 @@ A Solr cluster is a group of servers that each run one or more Solr _nodes_. There are two general modes of operating a cluster of Solr nodes. One mode provides central coordination of the Solr nodes (<>), while the other allows you to operate a cluster without this central coordination (<>). -TIP: "User-managed" is sometimes referred to as "Standalone" in source code. +TIP: "User Managed" is sometimes referred to as "Standalone" in source code. Both modes share general concepts, but ultimately differ in how those concepts are reflected in functionality and features. diff --git a/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc index 235058eaf02f..3a4fc8c081a6 100644 --- a/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc +++ b/solr/solr-ref-guide/modules/indexing-guide/pages/transforming-and-indexing-custom-json.adoc @@ -134,7 +134,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -261,7 +261,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -359,7 +359,7 @@ V1 API:: ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -416,7 +416,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs?useParams=my_para ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -513,7 +513,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -602,7 +602,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs'\ ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -690,7 +690,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs?split=/exams'\ ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -780,7 +780,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs' -H 'Content-type ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -818,7 +818,7 @@ curl 'http://localhost:8983/solr/techproducts/update/json/docs' -H 'Content-type ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] @@ -894,7 +894,7 @@ V1 API:: ---- ==== -V2 API User-Managed:: +V2 API User-Managed / Standalone Solr:: + ==== [source,bash] diff --git a/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc b/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc index fb7170d8116d..ee56007dfea3 100644 --- a/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc +++ b/solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc @@ -27,8 +27,8 @@ This feature is currently unsupported for grouping and Cursors. [IMPORTANT] ==== -This feature works in both user-managed and SolrCloud modes and always performs distributed search execution. -In user-managed mode, shard URLs must be explicitly allow-listed using the *allowUrls* parameter, otherwise Solr returns HTTP 403. For example: +This feature works in both Standalone and SolrCloud modes and always performs distributed search execution. +In Standalone (user-managed) mode, shard URLs must be explicitly allow-listed using the *allowUrls* parameter, otherwise Solr returns HTTP 403. For example: [source,bash] ----