Add capabilities for stats depending on the flag for now

smalyshev · Sep 11, 2024 · e77eafc · e77eafc
1 parent 8ad91b2
commit e77eafc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/...c/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/...c/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
@@ -23,6 +23,7 @@
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CancellableSingleObjectCache;
+import org.elasticsearch.common.util.FeatureFlag;
 import org.elasticsearch.common.util.concurrent.ListenableFuture;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.indices.IndicesService;
@@ -52,6 +53,8 @@ public class TransportClusterStatsAction extends TransportClusterStatsBaseAction
 
     public static final ActionType<ClusterStatsResponse> TYPE = new ActionType<>("cluster:monitor/stats");
 
+    public static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
+
     private final MetadataStatsCache<MappingStats> mappingStatsCache;
     private final MetadataStatsCache<AnalysisStats> analysisStatsCache;
     private final RemoteClusterService remoteClusterService;
@@ -178,8 +181,12 @@ protected boolean isFresh(Long currentKey, Long newKey) {
         }
     }
 
+    private static boolean doRemotes(ClusterStatsRequest request) {
+        return CCS_TELEMETRY_FEATURE_FLAG.isEnabled() && request.doRemotes();
+    }
+
     private Map<String, ClusterStatsResponse.RemoteClusterStats> getRemoteClusterStats(ClusterStatsRequest request) {
-        if (request.doRemotes() == false) {
+        if (doRemotes(request) == false) {
             return null;
         }
         Map<String, ClusterStatsResponse.RemoteClusterStats> remoteClustersStats = new HashMap<>();
@@ -211,7 +218,7 @@ private Map<String, RemoteClusterStatsResponse> resolveRemoteClusterStats() {
     }
 
     private ActionFuture<Map<String, RemoteClusterStatsResponse>> getStatsFromRemotes(ClusterStatsRequest request) {
-        if (request.doRemotes() == false) {
+        if (doRemotes(request) == false) {
             // this will never be used since getRemoteClusterStats has the same check
             return null;
         }

diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java
@@ -10,6 +10,8 @@
 
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequest;
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.common.util.FeatureFlag;
+import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.Scope;
@@ -28,6 +30,8 @@
 public class RestClusterStatsAction extends BaseRestHandler {
 
     private static final Set<String> SUPPORTED_CAPABILITIES = Set.of("human-readable-total-docs-size");
+    private static final Set<String> SUPPORTED_CAPABILITIES_CCS_STATS = Sets.union(SUPPORTED_CAPABILITIES, Set.of("ccs-stats"));
+    public static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
 
     @Override
     public List<Route> routes() {
@@ -39,6 +43,11 @@ public String getName() {
         return "cluster_stats_action";
     }
 
+    @Override
+    public Set<String> supportedQueryParameters() {
+        return Set.of("include_remotes", "nodeId");
+    }
+
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         ClusterStatsRequest clusterStatsRequest = new ClusterStatsRequest(
@@ -58,6 +67,6 @@ public boolean canTripCircuitBreaker() {
 
     @Override
     public Set<String> supportedCapabilities() {
-        return SUPPORTED_CAPABILITIES;
+        return CCS_TELEMETRY_FEATURE_FLAG.isEnabled() ? SUPPORTED_CAPABILITIES_CCS_STATS : SUPPORTED_CAPABILITIES;
     }
 }