Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove client.type setting #118192

Merged
merged 5 commits into from
Dec 9, 2024
Merged

Remove client.type setting #118192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77b9015
Remove client.type setting
rjernst Dec 6, 2024
3ae66a9
Update docs/changelog/118192.yaml
rjernst Dec 6, 2024
0fb1626
update release notes
rjernst Dec 6, 2024
5028549
spotless
rjernst Dec 6, 2024
c8c6375
changelog
rjernst Dec 6, 2024
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
11 changes: 11 additions & 0 deletions docs/changelog/118192.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pr: 118192
summary: Remove `client.type` setting
area: Infra/Core
type: breaking
issues: [104574]
breaking:
title: Remove `client.type` setting
area: Cluster and node setting
details: The node setting `client.type` has been ignored since the node client was removed in 8.0. The setting is now removed.
impact: Remove the `client.type` setting from `elasticsearch.yml`
notable: false
10 changes: 0 additions & 10 deletions server/src/main/java/org/elasticsearch/client/internal/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.transport.RemoteClusterService;
Expand All @@ -74,14 +72,6 @@
*/
public interface Client extends ElasticsearchClient {

// Note: This setting is registered only for bwc. The value is never read.
Setting<String> CLIENT_TYPE_SETTING_S = new Setting<>("client.type", "node", (s) -> {
return switch (s) {
case "node", "transport" -> s;
default -> throw new IllegalArgumentException("Can't parse [client.type] must be one of [node, transport]");
};
}, Property.NodeScope, Property.Deprecated);

/**
* The admin client that can be used to perform administrative operations.
*/
Expand Down
2 changes: 0 additions & 2 deletions server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.elasticsearch.action.support.DestructiveOperations;
import org.elasticsearch.action.support.replication.TransportReplicationAction;
import org.elasticsearch.bootstrap.BootstrapSettings;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterModule;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.InternalClusterInfoService;
Expand Down Expand Up @@ -483,7 +482,6 @@ public void apply(Settings value, Settings current, Settings previous) {
AutoCreateIndex.AUTO_CREATE_INDEX_SETTING,
BaseRestHandler.MULTI_ALLOW_EXPLICIT_INDEX,
ClusterName.CLUSTER_NAME_SETTING,
Client.CLIENT_TYPE_SETTING_S,
ClusterModule.SHARDS_ALLOCATOR_TYPE_SETTING,
EsExecutors.NODE_PROCESSORS_SETTING,
ThreadContext.DEFAULT_HEADERS_SETTING,
Expand Down