Skip to content

Commit e34601d

Browse files
authored
Remove archival functionality from 8.2 branch (#85524)
Archival won't ship with 8.2, hence removing the files there. I found it easier to remove the code than reintroducing a way to only enable it in snapshot builds. Relates #81210
1 parent f25346d commit e34601d

File tree

50 files changed

+3
-7998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3
-7998
lines changed

benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,11 +1233,6 @@
12331233
"total" : 0,
12341234
"failed" : 0
12351235
}
1236-
},
1237-
"archive" : {
1238-
"available" : false,
1239-
"enabled" : true,
1240-
"indices_count" : 0
12411236
}
12421237
}
12431238
}

docs/reference/rest-api/info.asciidoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ Example response:
8181
"available" : true,
8282
"enabled" : true
8383
},
84-
"archive" : {
85-
"available" : true,
86-
"enabled" : true
87-
},
8884
"enrich" : {
8985
"available" : true,
9086
"enabled" : true

docs/reference/rest-api/usage.asciidoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,6 @@ GET /_xpack/usage
395395
"aggregate_metric" : {
396396
"available" : true,
397397
"enabled" : true
398-
},
399-
"archive" : {
400-
"available" : true,
401-
"enabled" : true,
402-
"indices_count" : 0
403398
}
404399
}
405400
------------------------------------------------------------

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
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.xpack.core.action.XPackUsageAction;
3737
import org.elasticsearch.xpack.core.aggregatemetric.AggregateMetricFeatureSetUsage;
3838
import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage;
39-
import org.elasticsearch.xpack.core.archive.ArchiveFeatureSetUsage;
4039
import org.elasticsearch.xpack.core.async.DeleteAsyncResultAction;
4140
import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata;
4241
import org.elasticsearch.xpack.core.datastreams.DataStreamFeatureSetUsage;
@@ -559,9 +558,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
559558
// Data Streams
560559
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_STREAMS, DataStreamFeatureSetUsage::new),
561560
// Data Tiers
562-
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new),
563-
// Archive
564-
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.ARCHIVE, ArchiveFeatureSetUsage::new)
561+
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new)
565562
)
566563
);
567564

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
@@ -71,8 +71,6 @@ public final class XPackField {
7171
public static final String AGGREGATE_METRIC = "aggregate_metric";
7272
/** Name constant for the operator privileges feature. */
7373
public static final String OPERATOR_PRIVILEGES = "operator_privileges";
74-
/** Name constant for the archive feature. */
75-
public static final String ARCHIVE = "archive";
7674

7775
private XPackField() {}
7876

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
4747
public static final XPackInfoFeatureAction DATA_STREAMS = new XPackInfoFeatureAction(XPackField.DATA_STREAMS);
4848
public static final XPackInfoFeatureAction DATA_TIERS = new XPackInfoFeatureAction(XPackField.DATA_TIERS);
4949
public static final XPackInfoFeatureAction AGGREGATE_METRIC = new XPackInfoFeatureAction(XPackField.AGGREGATE_METRIC);
50-
public static final XPackInfoFeatureAction ARCHIVE = new XPackInfoFeatureAction(XPackField.ARCHIVE);
5150

5251
public static final List<XPackInfoFeatureAction> ALL;
5352
static {
@@ -75,8 +74,7 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
7574
DATA_STREAMS,
7675
SEARCHABLE_SNAPSHOTS,
7776
DATA_TIERS,
78-
AGGREGATE_METRIC,
79-
ARCHIVE
77+
AGGREGATE_METRIC
8078
)
8179
);
8280
ALL = Collections.unmodifiableList(actions);

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
4444
public static final XPackUsageFeatureAction DATA_STREAMS = new XPackUsageFeatureAction(XPackField.DATA_STREAMS);
4545
public static final XPackUsageFeatureAction DATA_TIERS = new XPackUsageFeatureAction(XPackField.DATA_TIERS);
4646
public static final XPackUsageFeatureAction AGGREGATE_METRIC = new XPackUsageFeatureAction(XPackField.AGGREGATE_METRIC);
47-
public static final XPackUsageFeatureAction ARCHIVE = new XPackUsageFeatureAction(XPackField.ARCHIVE);
4847

4948
static final List<XPackUsageFeatureAction> ALL = List.of(
5049
AGGREGATE_METRIC,
@@ -67,8 +66,7 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
6766
SQL,
6867
TRANSFORM,
6968
VOTING_ONLY,
70-
WATCHER,
71-
ARCHIVE
69+
WATCHER
7270
);
7371

7472
// public for testing

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

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

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsageTests.java

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

x-pack/plugin/old-lucene-versions/build.gradle

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

x-pack/plugin/old-lucene-versions/src/internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/AbstractArchiveTestCase.java

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

0 commit comments

Comments
 (0)