Skip to content

Commit a848fc9

Browse files
committed
Revert "Add usage stats for frozen indices (#44286)"
This reverts commit 5e73c49.
1 parent 7b68bfb commit a848fc9

File tree

8 files changed

+3
-240
lines changed

8 files changed

+3
-240
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig;
5959
import org.elasticsearch.xpack.core.deprecation.DeprecationInfoAction;
6060
import org.elasticsearch.xpack.core.flattened.FlattenedFeatureSetUsage;
61-
import org.elasticsearch.xpack.core.frozen.FrozenIndicesFeatureSetUsage;
6261
import org.elasticsearch.xpack.core.graph.GraphFeatureSetUsage;
6362
import org.elasticsearch.xpack.core.graph.action.GraphExploreAction;
6463
import org.elasticsearch.xpack.core.indexlifecycle.AllocateAction;
@@ -522,9 +521,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
522521
// Vectors
523522
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.VECTORS, VectorsFeatureSetUsage::new),
524523
// Voting Only Node
525-
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.VOTING_ONLY, VotingOnlyNodeFeatureSetUsage::new),
526-
// Frozen indices
527-
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.FROZEN_INDICES, FrozenIndicesFeatureSetUsage::new)
524+
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.VOTING_ONLY, VotingOnlyNodeFeatureSetUsage::new)
528525
);
529526
}
530527

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackField.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public final class XPackField {
4343
public static final String VECTORS = "vectors";
4444
/** Name constant for the voting-only-node feature. */
4545
public static final String VOTING_ONLY = "voting_only";
46-
/** Name constant for the frozen index feature. */
47-
public static final String FROZEN_INDICES = "frozen_indices";
4846

4947
private XPackField() {}
5048

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import org.apache.lucene.util.SetOnce;
1111
import org.elasticsearch.SpecialPermission;
1212
import org.elasticsearch.Version;
13+
import org.elasticsearch.action.ActionType;
1314
import org.elasticsearch.action.ActionRequest;
1415
import org.elasticsearch.action.ActionResponse;
15-
import org.elasticsearch.action.ActionType;
1616
import org.elasticsearch.action.support.ActionFilter;
1717
import org.elasticsearch.client.Client;
1818
import org.elasticsearch.client.transport.TransportClient;
@@ -63,7 +63,6 @@
6363
import org.elasticsearch.xpack.core.action.TransportXPackUsageAction;
6464
import org.elasticsearch.xpack.core.action.XPackInfoAction;
6565
import org.elasticsearch.xpack.core.action.XPackUsageAction;
66-
import org.elasticsearch.xpack.core.frozen.FrozenIndicesFeatureSet;
6766
import org.elasticsearch.xpack.core.ml.MlMetadata;
6867
import org.elasticsearch.xpack.core.rest.action.RestFreezeIndexAction;
6968
import org.elasticsearch.xpack.core.rest.action.RestReloadAnalyzersAction;
@@ -243,7 +242,6 @@ public Collection<Module> createGuiceModules() {
243242

244243
if (transportClientMode) {
245244
modules.add(b -> b.bind(XPackLicenseState.class).toProvider(Providers.of(null)));
246-
modules.add(b -> bindFeatureSet(b, FrozenIndicesFeatureSet.class));
247245
}
248246
return modules;
249247
}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/frozen/FrozenIndicesFeatureSet.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/frozen/FrozenIndicesFeatureSetUsage.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/frozen/FrozenIndicesFeatureSetUsageTests.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/20_stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ setup:
5252

5353
# unfreeze index
5454
- do:
55-
indices.unfreeze:
55+
indices.freeze:
5656
index: test
5757
wait_for_active_shards: 1
5858
- is_true: acknowledged

x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/30_usage.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)