Skip to content

Commit 4f66811

Browse files
author
Hendrik Muhs
authored
[7.8][Transform] fix page size return in cat transform, add dps (#57912)
fixes the page size reported after moving page size to settings(#56007) and adds documents per second(throttling) to the output. fixes #56498
1 parent 4c010a9 commit 4f66811

File tree

8 files changed

+128
-148
lines changed

8 files changed

+128
-148
lines changed

docs/reference/cat/transforms.asciidoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Returns configuration and usage information about {transforms}.
2020
[[cat-transforms-api-prereqs]]
2121
==== {api-prereq-title}
2222

23-
* If the {es} {security-features} are enabled, you must have `monitor_transform`
24-
cluster privileges to use this API. The built-in `transform_user` role has these
25-
privileges. For more information, see <<security-privileges>> and
23+
* If the {es} {security-features} are enabled, you must have `monitor_transform`
24+
cluster privileges to use this API. The built-in `transform_user` role has these
25+
privileges. For more information, see <<security-privileges>> and
2626
<<built-in-roles>>.
2727

2828
//[[cat-transforms-api-desc]]
@@ -77,6 +77,10 @@ include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=dest-index]
7777
`documents_indexed`, `doci`:::
7878
include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=docs-indexed]
7979

80+
`docs_per_second`, `dps`:::
81+
(Default)
82+
include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=transform-settings-docs-per-second]
83+
8084
`documents_processed`, `docp`:::
8185
include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=docs-processed]
8286

@@ -139,7 +143,7 @@ include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=state-transform]
139143

140144
`transform_type`, `tt`:::
141145
(Default)
142-
Indicates the type of {transform}: `batch` or `continuous`.
146+
Indicates the type of {transform}: `batch` or `continuous`.
143147

144148
`trigger_count`, `tc`:::
145149
include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=trigger-count]

x-pack/plugin/src/test/resources/rest-api-spec/test/transform/transforms_cat_apis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ teardown:
5555
transform_id: "airline-transform-stats"
5656
- match:
5757
$body: |
58-
/^ #id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ state \n
59-
(airline\-transform\-stats \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data \s+ airline-data-by-airline \s+ \s+ batch \s+ 1m \s+ 500 \s+ STOPPED \n)+ $/
58+
/^ #id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ docs_per_second \s+ state \n
59+
(airline\-transform\-stats \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data \s+ airline-data-by-airline \s+ \s+ batch \s+ 1m \s+ 500 \s+ - \s+ STOPPED \n)+ $/
6060
6161
---
6262
"Test cat transform stats with column selection":
@@ -95,8 +95,8 @@ teardown:
9595
v: true
9696
- match:
9797
$body: |
98-
/^ id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ description \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ state \n
99-
(airline\-transform\-batch \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data,airline-data-other \s+ airline-data-by-airline-batch \s+ \s+ description \s+ batch \s+ 1m \s+ 500 \s+ STOPPED \n)+ $/
98+
/^ id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ description \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ docs_per_second \s+ state \n
99+
(airline\-transform\-batch \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data,airline-data-other \s+ airline-data-by-airline-batch \s+ \s+ description \s+ batch \s+ 1m \s+ 500 \s+ - \s+ STOPPED \n)+ $/
100100
- do:
101101
transform.delete_transform:
102102
transform_id: "airline-transform-batch"
@@ -131,8 +131,8 @@ teardown:
131131
v: true
132132
- match:
133133
$body: |
134-
/^ id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ description \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ state \n
135-
(airline\-transform\-continuous \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data,airline-data-other \s+ airline-data-by-airline-continuous \s+ \s+ description \s+ continuous \s+ 10s \s+ 500 \s+ STOPPED \n)+ $/
134+
/^ id \s+ create_time \s+ version \s+ source_index \s+ dest_index \s+ pipeline \s+ description \s+ transform_type \s+ frequency \s+ max_page_search_size \s+ docs_per_second \s+ state \n
135+
(airline\-transform\-continuous \s+ [^\s]+ \s+ [^\s]+ \s+ airline-data,airline-data-other \s+ airline-data-by-airline-continuous \s+ \s+ description \s+ continuous \s+ 10s \s+ 500 \s+ - \s+ STOPPED \n)+ $/
136136
- do:
137137
transform.delete_transform:
138138
transform_id: "airline-transform-continuous"

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.elasticsearch.common.settings.Settings;
2929
import org.elasticsearch.common.settings.SettingsFilter;
3030
import org.elasticsearch.common.settings.SettingsModule;
31+
import org.elasticsearch.common.unit.TimeValue;
3132
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
3233
import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry;
3334
import org.elasticsearch.env.Environment;
@@ -132,6 +133,8 @@ public class Transform extends Plugin implements SystemIndexPlugin, PersistentTa
132133
private final SetOnce<TransformServices> transformServices = new SetOnce<>();
133134

134135
public static final int DEFAULT_FAILURE_RETRIES = 10;
136+
public static final Integer DEFAULT_INITIAL_MAX_PAGE_SEARCH_SIZE = Integer.valueOf(500);
137+
public static final TimeValue DEFAULT_TRANSFORM_FREQUENCY = TimeValue.timeValueMillis(60000);
135138

136139
// How many times the transform task can retry on an non-critical failure
137140
public static final Setting<Integer> NUM_FAILURE_RETRIES_SETTING = Setting.intSetting(
@@ -283,12 +286,7 @@ public Collection<Object> createComponents(
283286

284287
TransformConfigManager configManager = new IndexBasedTransformConfigManager(client, xContentRegistry);
285288
TransformAuditor auditor = new TransformAuditor(client, clusterService.getNodeName());
286-
TransformCheckpointService checkpointService = new TransformCheckpointService(
287-
settings,
288-
clusterService,
289-
configManager,
290-
auditor
291-
);
289+
TransformCheckpointService checkpointService = new TransformCheckpointService(settings, clusterService, configManager, auditor);
292290
SchedulerEngine scheduler = new SchedulerEngine(settings, Clock.systemUTC());
293291

294292
transformServices.set(new TransformServices(configManager, checkpointService, auditor, scheduler));

0 commit comments

Comments
 (0)