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
elastic · Mar 31, 2022 · e34601d · e34601d
1 parent f25346d
commit e34601d
Show file tree

Hide file tree

Showing 50 changed files with 3 additions and 7,998 deletions.
diff --git a/...hmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json b/...hmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json
@@ -1233,11 +1233,6 @@
             "total" : 0,
             "failed" : 0
           }
-        },
-        "archive" : {
-          "available" : false,
-          "enabled" : true,
-          "indices_count" : 0
         }
       }
     }

diff --git a/docs/reference/rest-api/info.asciidoc b/docs/reference/rest-api/info.asciidoc
@@ -81,10 +81,6 @@ Example response:
           "available" : true,
           "enabled" : true
       },
-      "archive" : {
-          "available" : true,
-          "enabled" : true
-      },
       "enrich" : {
           "available" : true,
           "enabled" : true

diff --git a/docs/reference/rest-api/usage.asciidoc b/docs/reference/rest-api/usage.asciidoc
@@ -395,11 +395,6 @@ GET /_xpack/usage
   "aggregate_metric" : {
     "available" : true,
     "enabled" : true
-  },
-  "archive" : {
-    "available" : true,
-    "enabled" : true,
-    "indices_count" : 0
   }
 }
 ------------------------------------------------------------

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java
@@ -36,7 +36,6 @@
 import org.elasticsearch.xpack.core.action.XPackUsageAction;
 import org.elasticsearch.xpack.core.aggregatemetric.AggregateMetricFeatureSetUsage;
 import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage;
-import org.elasticsearch.xpack.core.archive.ArchiveFeatureSetUsage;
 import org.elasticsearch.xpack.core.async.DeleteAsyncResultAction;
 import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata;
 import org.elasticsearch.xpack.core.datastreams.DataStreamFeatureSetUsage;
@@ -559,9 +558,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
                 // Data Streams
                 new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_STREAMS, DataStreamFeatureSetUsage::new),
                 // Data Tiers
-                new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new),
-                // Archive
-                new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.ARCHIVE, ArchiveFeatureSetUsage::new)
+                new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.DATA_TIERS, DataTiersFeatureSetUsage::new)
             )
         );
 

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackField.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackField.java
@@ -71,8 +71,6 @@ public final class XPackField {
     public static final String AGGREGATE_METRIC = "aggregate_metric";
     /** Name constant for the operator privileges feature. */
     public static final String OPERATOR_PRIVILEGES = "operator_privileges";
-    /** Name constant for the archive feature. */
-    public static final String ARCHIVE = "archive";
 
     private XPackField() {}
 

diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackInfoFeatureAction.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackInfoFeatureAction.java
@@ -47,7 +47,6 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
     public static final XPackInfoFeatureAction DATA_STREAMS = new XPackInfoFeatureAction(XPackField.DATA_STREAMS);
     public static final XPackInfoFeatureAction DATA_TIERS = new XPackInfoFeatureAction(XPackField.DATA_TIERS);
     public static final XPackInfoFeatureAction AGGREGATE_METRIC = new XPackInfoFeatureAction(XPackField.AGGREGATE_METRIC);
-    public static final XPackInfoFeatureAction ARCHIVE = new XPackInfoFeatureAction(XPackField.ARCHIVE);
 
     public static final List<XPackInfoFeatureAction> ALL;
     static {
@@ -75,8 +74,7 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
                 DATA_STREAMS,
                 SEARCHABLE_SNAPSHOTS,
                 DATA_TIERS,
-                AGGREGATE_METRIC,
-                ARCHIVE
+                AGGREGATE_METRIC
             )
         );
         ALL = Collections.unmodifiableList(actions);

diff --git a/...lugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureAction.java b/...lugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureAction.java
@@ -44,7 +44,6 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
     public static final XPackUsageFeatureAction DATA_STREAMS = new XPackUsageFeatureAction(XPackField.DATA_STREAMS);
     public static final XPackUsageFeatureAction DATA_TIERS = new XPackUsageFeatureAction(XPackField.DATA_TIERS);
     public static final XPackUsageFeatureAction AGGREGATE_METRIC = new XPackUsageFeatureAction(XPackField.AGGREGATE_METRIC);
-    public static final XPackUsageFeatureAction ARCHIVE = new XPackUsageFeatureAction(XPackField.ARCHIVE);
 
     static final List<XPackUsageFeatureAction> ALL = List.of(
         AGGREGATE_METRIC,
@@ -67,8 +66,7 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
         SQL,
         TRANSFORM,
         VOTING_ONLY,
-        WATCHER,
-        ARCHIVE
+        WATCHER
     );
 
     // public for testing

diff --git a/...lugin/core/src/main/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsage.java b/...lugin/core/src/main/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsage.java
diff --git a/.../core/src/test/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsageTests.java b/.../core/src/test/java/org/elasticsearch/xpack/core/archive/ArchiveFeatureSetUsageTests.java
diff --git a/x-pack/plugin/old-lucene-versions/build.gradle b/x-pack/plugin/old-lucene-versions/build.gradle
diff --git a/.../internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/AbstractArchiveTestCase.java b/.../internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/AbstractArchiveTestCase.java