mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-20 03:45:02 +00:00
The count should match the number of all df-analytics that matched the id in the request. However, we set the count to the number of df-analytics returned which was bound to the `size` parameter. This commit fixes this by setting the count to the count of the `get` response.
This commit is contained in:
parent
cdf55cb5c5
commit
30b20920b9
@ -134,12 +134,21 @@ public class TransportGetDataFrameAnalyticsStatsAction
|
|||||||
LOGGER.debug("Get stats for data frame analytics [{}]", request.getId());
|
LOGGER.debug("Get stats for data frame analytics [{}]", request.getId());
|
||||||
|
|
||||||
ActionListener<GetDataFrameAnalyticsAction.Response> getResponseListener = ActionListener.wrap(
|
ActionListener<GetDataFrameAnalyticsAction.Response> getResponseListener = ActionListener.wrap(
|
||||||
response -> {
|
getResponse -> {
|
||||||
List<String> expandedIds = response.getResources().results().stream().map(DataFrameAnalyticsConfig::getId)
|
List<String> expandedIds = getResponse.getResources().results().stream().map(DataFrameAnalyticsConfig::getId)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
request.setExpandedIds(expandedIds);
|
request.setExpandedIds(expandedIds);
|
||||||
ActionListener<GetDataFrameAnalyticsStatsAction.Response> runningTasksStatsListener = ActionListener.wrap(
|
ActionListener<GetDataFrameAnalyticsStatsAction.Response> runningTasksStatsListener = ActionListener.wrap(
|
||||||
runningTasksStatsResponse -> gatherStatsForStoppedTasks(request.getExpandedIds(), runningTasksStatsResponse, listener),
|
runningTasksStatsResponse -> gatherStatsForStoppedTasks(request.getExpandedIds(), runningTasksStatsResponse,
|
||||||
|
ActionListener.wrap(
|
||||||
|
finalResponse -> {
|
||||||
|
// While finalResponse has all the stats objects we need, we should report the count
|
||||||
|
// from the get response
|
||||||
|
QueryPage<Stats> finalStats = new QueryPage<>(finalResponse.getResponse().results(),
|
||||||
|
getResponse.getResources().count(), GetDataFrameAnalyticsAction.Response.RESULTS_FIELD);
|
||||||
|
listener.onResponse(new GetDataFrameAnalyticsStatsAction.Response(finalStats));
|
||||||
|
},
|
||||||
|
listener::onFailure)),
|
||||||
listener::onFailure
|
listener::onFailure
|
||||||
);
|
);
|
||||||
super.doExecute(task, request, runningTasksStatsListener);
|
super.doExecute(task, request, runningTasksStatsListener);
|
||||||
|
@ -776,6 +776,7 @@ setup:
|
|||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
id: "*"
|
id: "*"
|
||||||
- match: { count: 3 }
|
- match: { count: 3 }
|
||||||
|
- length: { data_frame_analytics : 3 }
|
||||||
- match: { data_frame_analytics.0.id: "bar" }
|
- match: { data_frame_analytics.0.id: "bar" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
- match: { data_frame_analytics.1.id: "foo-1" }
|
- match: { data_frame_analytics.1.id: "foo-1" }
|
||||||
@ -787,6 +788,7 @@ setup:
|
|||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
id: "foo-*"
|
id: "foo-*"
|
||||||
- match: { count: 2 }
|
- match: { count: 2 }
|
||||||
|
- length: { data_frame_analytics : 2 }
|
||||||
- match: { data_frame_analytics.0.id: "foo-1" }
|
- match: { data_frame_analytics.0.id: "foo-1" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
- match: { data_frame_analytics.1.id: "foo-2" }
|
- match: { data_frame_analytics.1.id: "foo-2" }
|
||||||
@ -796,20 +798,23 @@ setup:
|
|||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
id: "bar"
|
id: "bar"
|
||||||
- match: { count: 1 }
|
- match: { count: 1 }
|
||||||
|
- length: { data_frame_analytics : 1 }
|
||||||
- match: { data_frame_analytics.0.id: "bar" }
|
- match: { data_frame_analytics.0.id: "bar" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
|
|
||||||
- do:
|
- do:
|
||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
from: 2
|
from: 2
|
||||||
- match: { count: 1 }
|
- match: { count: 3 }
|
||||||
|
- length: { data_frame_analytics : 1 }
|
||||||
- match: { data_frame_analytics.0.id: "foo-2" }
|
- match: { data_frame_analytics.0.id: "foo-2" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
|
|
||||||
- do:
|
- do:
|
||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
size: 2
|
size: 2
|
||||||
- match: { count: 2 }
|
- match: { count: 3 }
|
||||||
|
- length: { data_frame_analytics : 2 }
|
||||||
- match: { data_frame_analytics.0.id: "bar" }
|
- match: { data_frame_analytics.0.id: "bar" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
- match: { data_frame_analytics.1.id: "foo-1" }
|
- match: { data_frame_analytics.1.id: "foo-1" }
|
||||||
@ -819,7 +824,8 @@ setup:
|
|||||||
ml.get_data_frame_analytics_stats:
|
ml.get_data_frame_analytics_stats:
|
||||||
from: 1
|
from: 1
|
||||||
size: 1
|
size: 1
|
||||||
- match: { count: 1 }
|
- match: { count: 3 }
|
||||||
|
- length: { data_frame_analytics : 1 }
|
||||||
- match: { data_frame_analytics.0.id: "foo-1" }
|
- match: { data_frame_analytics.0.id: "foo-1" }
|
||||||
- match: { data_frame_analytics.0.state: "stopped" }
|
- match: { data_frame_analytics.0.state: "stopped" }
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user