Skip to content

Commit

Permalink
Merge branch 'main' into add-ml-models-api
Browse files Browse the repository at this point in the history
Signed-off-by: Nathalie Jonathan <[email protected]>
  • Loading branch information
nathaliellenaa authored Dec 19, 2024
2 parents 789ab69 + a2afe56 commit 8e44ea2
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 5 deletions.
22 changes: 22 additions & 0 deletions spec/namespaces/_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,8 @@ paths:
responses:
'200':
$ref: '#/components/responses/clear_scroll@200'
'404':
$ref: '#/components/responses/clear_scroll@404'
/_search/scroll/{scroll_id}:
get:
operationId: scroll.2
Expand Down Expand Up @@ -956,6 +958,8 @@ paths:
responses:
'200':
$ref: '#/components/responses/clear_scroll@200'
'404':
$ref: '#/components/responses/clear_scroll@404'
/_search/template:
get:
operationId: search_template.0
Expand Down Expand Up @@ -2868,6 +2872,20 @@ components:
required:
- num_freed
- succeeded
clear_scroll@404:
content:
application/json:
schema:
type: object
properties:
succeeded:
type: boolean
num_freed:
type: integer
format: int32
required:
- num_freed
- succeeded
count@200:
content:
application/json:
Expand Down Expand Up @@ -3370,6 +3388,10 @@ components:
type: object
additionalProperties:
$ref: '../schemas/_core.update_by_query_rethrottle.yaml#/components/schemas/UpdateByQueryRethrottleNode'
node_failures:
type: array
items:
$ref: '../schemas/_common.yaml#/components/schemas/ErrorCause'
required:
- nodes
parameters:
Expand Down
8 changes: 8 additions & 0 deletions tests/default/_core/search/scroll.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,11 @@ chapters:
path: /_search/scroll/{scroll_id}
parameters:
scroll_id: ${scroll.scroll_id}
- synopsis: Deleting a non-existent scroll.
method: DELETE
path: /_search/scroll
request:
payload:
scroll_id: ${scroll.scroll_id}
response:
status: 404
25 changes: 25 additions & 0 deletions tests/default/_core/update_by_query/rethrottle.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
$schema: ../../../../json_schemas/test_story.schema.yaml

description: Test Update By Query rethrottle endpoint.
prologues:
- path: /books/_update_by_query
id: task
method: POST
parameters:
refresh: true
conflicts: proceed
wait_for_completion: false
request:
payload:
query:
match_all: {}
output:
id: payload.task
chapters:
- synopsis: Update by query.
path: /_update_by_query/{task_id}/_rethrottle
method: POST
parameters:
task_id: ${task.id}
requests_per_second: 10

22 changes: 20 additions & 2 deletions tests/plugins/workload-management/wlm/query_group.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ chapters:
resource_limits:
memory: 0.1
resiliency_mode: monitor
- synopsis: Update a QueryGroup by name.
path: /_wlm/query_group/{name}
method: PUT
parameters:
name: analytics
request:
payload:
resource_limits:
memory: 0.2
resiliency_mode: soft
- synopsis: Get the QueryGroup by name.
path: /_wlm/query_group/{name}
method: GET
Expand All @@ -24,11 +34,19 @@ chapters:
query_groups:
- name: analytics
resource_limits:
memory: 0.1
resiliency_mode: monitor
memory: 0.2
resiliency_mode: soft
- synopsis: Get all QueryGroups.
path: /_wlm/query_group
method: GET
response:
status: 200
payload:
query_groups:
- name: analytics
resource_limits:
memory: 0.2
resiliency_mode: soft
- synopsis: Delete a QueryGroup.
path: /_wlm/query_group/{name}
parameters:
Expand Down
27 changes: 24 additions & 3 deletions tests/snapshot/snapshot/snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ epilogues:
parameters:
repository: my-fs-repository
snapshot: my-test-snapshot
- path: /_snapshot/{repository}/{snapshot}
method: DELETE
status: [200, 404]
parameters:
repository: my-fs-repository
snapshot: my-second-snapshot
- path: /_snapshot/{repository}
method: DELETE
status: [200, 404]
Expand Down Expand Up @@ -65,7 +71,22 @@ chapters:
status: 200
payload:
snapshot:
snapshot: my-test-snapshot
snapshot: my-test-snapshot
- synopsis: Create a second snapshot.
path: /_snapshot/{repository}/{snapshot}
method: POST
parameters:
repository: my-fs-repository
snapshot: my-second-snapshot
wait_for_completion: true
request:
payload:
indices: '*'
response:
status: 200
payload:
snapshot:
snapshot: my-second-snapshot
- synopsis: Get information about a snapshot.
path: /_snapshot/{repository}/{snapshot}
method: GET
Expand All @@ -82,13 +103,13 @@ chapters:
method: GET
parameters:
repository: my-fs-repository
snapshot: my-test-snapshot
snapshot: my-second-snapshot
human: true
response:
status: 200
payload:
snapshots:
- snapshot: my-test-snapshot
- snapshot: my-second-snapshot
- synopsis: Delete a snapshot.
path: /_snapshot/{repository}/{snapshot}
method: DELETE
Expand Down
2 changes: 2 additions & 0 deletions tests/snapshot/snapshot/status.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ prologues:
ignore_unavailable: true
include_global_state: false
partial: true
retry:
count: 3
chapters:
- synopsis: Get status of all running snapshots.
path: /_snapshot/_status
Expand Down

0 comments on commit 8e44ea2

Please sign in to comment.