Skip to content

ILM setPriority corrections for a 0 value #38001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2019
Merged

ILM setPriority corrections for a 0 value #38001

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2a4b95
ILM setPriority corrections for a 0 value
jakelandis Jan 30, 2019
23a2bc0
Merge branch 'master' into fix_set_priority_action_test
jakelandis Jan 30, 2019
fb63663
fix transform/search
jakelandis Jan 30, 2019
7974f6d
Revert "fix transform/search"
jakelandis Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...t-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/SetPriorityAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static SetPriorityAction parse(XContentParser parser) {
}

public SetPriorityAction(@Nullable Integer recoveryPriority) {
if (recoveryPriority != null && recoveryPriority <= 0) {
if (recoveryPriority != null && recoveryPriority < 0) {
throw new IllegalArgumentException("[" + RECOVERY_PRIORITY_FIELD.getPreferredName() + "] must be 0 or greater");
}
this.recoveryPriority = recoveryPriority;
Expand Down
2 changes: 1 addition & 1 deletion ...h-level/src/test/java/org/elasticsearch/client/indexlifecycle/SetPriorityActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected boolean supportsUnknownFields() {
}

public void testNonPositivePriority() {
Exception e = expectThrows(Exception.class, () -> new SetPriorityAction(randomIntBetween(-100, 0)));
Exception e = expectThrows(Exception.class, () -> new SetPriorityAction(randomIntBetween(-100, -1)));
assertThat(e.getMessage(), equalTo("[priority] must be 0 or greater"));
}

Expand Down
6 changes: 0 additions & 6 deletions x-pack/docs/en/watcher/transform/search.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ The following table lists all available settings for the search transform:

| `request.indices` | no | all indices | One or more indices to search on.

| `request.types` | no | all types | One or more document types to search on (may be a
comma-delimited string or an array of document types
names)

| `request.body` | no | `match_all` query | The body of the request. The
{ref}/search-request-body.html[request body] follows
the same structure you normally send in the body of
Expand Down Expand Up @@ -105,7 +101,6 @@ time of the watch:
"search" : {
"request" : {
"indices" : [ "logstash-*" ],
"types" : [ "event" ],
"body" : {
"size" : 0,
"query" : {
Expand Down Expand Up @@ -145,7 +140,6 @@ The following is an example of using templates that refer to provided parameters
"search" : {
"request" : {
"indices" : [ "logstash-*" ],
"types" : [ "event" ],
"template" : {
"source" : {
"size" : 0,
Expand Down
3 changes: 1 addition & 2 deletions ...ore/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/SetPriorityActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ protected Reader<SetPriorityAction> instanceReader() {
return SetPriorityAction::new;
}

@AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/37652")
public void testNonPositivePriority() {
Exception e = expectThrows(Exception.class, () -> new SetPriorityAction(randomIntBetween(-100, 0)));
Exception e = expectThrows(Exception.class, () -> new SetPriorityAction(randomIntBetween(-100, -1)));
assertThat(e.getMessage(), equalTo("[priority] must be 0 or greater"));
}

Expand Down