Skip to content

Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in Index APIs except index template APIs#2660

Merged
tlfeng merged 16 commits into
opensearch-project:mainfrom
tlfeng:manager-timeout-index-api
Apr 5, 2022
Merged

Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in Index APIs except index template APIs#2660
tlfeng merged 16 commits into
opensearch-project:mainfrom
tlfeng:manager-timeout-index-api

Conversation

@tlfeng
Copy link
Copy Markdown
Contributor

@tlfeng tlfeng commented Mar 30, 2022

Description

List of the Index APIs that have got request parameter master_timeout:

Issues Resolved

A part of issue #2511

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Tianli Feng added 3 commits March 29, 2022 21:05
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng added enhancement Enhancement or improvement to existing feature or request v2.0.0 Version 2.0.0 WIP Work in progress backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch labels Mar 30, 2022
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure 6fa9c04
Log 3892

Reports 3892

Copy link
Copy Markdown
Contributor

@nknize nknize left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same change request as in #2658

Tianli Feng added 2 commits March 30, 2022 15:08
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure befebfe
Log 3931

Reports 3931

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure 95c64a3
Log 3933

Reports 3933

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng force-pushed the manager-timeout-index-api branch from 2a50055 to 5bfd22b Compare March 30, 2022 22:41
@tlfeng tlfeng changed the title Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in Index APIs - part 1 Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in half of Index APIs (without index template APIs) Mar 30, 2022
@tlfeng tlfeng changed the title Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in half of Index APIs (without index template APIs) Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in half of Index APIs (except index template APIs) Mar 30, 2022
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure a69879f
Log 3937

Reports 3937

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng force-pushed the manager-timeout-index-api branch from 80c9115 to b892805 Compare March 30, 2022 23:06
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure 5bfd22b
Log 3938

Reports 3938

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure 80c91153c1a7af82725aec558ad1aa19b19b8243
Log 3939

Reports 3939

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure b892805
Log 3940

Reports 3940

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure 4ac10f6
Log 3942

Reports 3942

@tlfeng tlfeng changed the title Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in half of Index APIs (except index template APIs) Add request parameter 'cluster_manager_timeout' and deprecate 'master_timeout' - in Index APIs except index template APIs Mar 31, 2022
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

✅   Gradle Check success 2c69826
Log 4153

Reports 4153

@tlfeng
Copy link
Copy Markdown
Contributor Author

tlfeng commented Apr 4, 2022

In log 4153:
Although it shows "build successful", there is a test failure.

REPRODUCE WITH: ./gradlew ':qa:mixed-cluster:v2.0.0#mixedClusterTest' --tests "org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT" -Dtests.method="test {p0=tasks.list/10_basic/tasks_list test}" -Dtests.seed=B4F39ACD8A2A3DED -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=es-PE -Dtests.timezone=Australia/ACT -Druntime.java=17

org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT > test {p0=tasks.list/10_basic/tasks_list test} FAILED
    java.lang.AssertionError: Failure at [tasks.list/10_basic:15]: field [nodes.$node_id.roles] doesn't have a true value
    Expected: not null
         but: was null
        at __randomizedtesting.SeedInfo.seed([B4F39ACD8A2A3DED:3CA7A51724D65015]:0)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.executeSection(OpenSearchClientYamlSuiteTestCase.java:454)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.test(OpenSearchClientYamlSuiteTestCase.java:427)

It's reproducible locally and also in main branch. It started to fail after bumping version to 2.1 on main branch in PR #2715 / commit 6c195ab .
Update: after the commit cb238aa / PR #2556 merged, main branch is bumped to version 3.0.0, the test failure can sometime be reproduced by:

REPRODUCE WITH: ./gradlew ':qa:mixed-cluster:v2.1.0#mixedClusterTest' --tests "org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT" -Dtests.method="test {p0=tasks.list/10_basic/tasks_list test}" -Dtests.seed=B4F39ACD8A2A3DED -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=es-PE -Dtests.timezone=Australia/ACT -Druntime.java=17

org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT > test {p0=tasks.list/10_basic/tasks_list test} FAILED
    java.lang.AssertionError: Failure at [tasks.list/10_basic:15]: field [nodes.$node_id.roles] doesn't have a true value
    Expected: not null
         but: was null
        at __randomizedtesting.SeedInfo.seed([B4F39ACD8A2A3DED:3CA7A51724D65015]:0)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.executeSection(OpenSearchClientYamlSuiteTestCase.java:454)
        at org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase.test(OpenSearchClientYamlSuiteTestCase.java:427)

Update: It's tracked in issue #2757

Copy link
Copy Markdown
Contributor

@nknize nknize left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah.. this is much cleaner!!! Nice work.

Comment thread rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json Outdated
Tianli Feng added 2 commits April 4, 2022 21:22
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure e085e53
Log 4185

Reports 4185

@nknize
Copy link
Copy Markdown
Contributor

nknize commented Apr 5, 2022

#1703 strikes again!

@nknize
Copy link
Copy Markdown
Contributor

nknize commented Apr 5, 2022

start gradle check

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

❌   Gradle Check failure e085e53
Log 4188

Reports 4188

@tlfeng
Copy link
Copy Markdown
Contributor Author

tlfeng commented Apr 5, 2022

In log 4188:

* What went wrong:
Execution failed for task ':modules:analysis-common:test'.
> Process 'Gradle Test Executor 446' finished with non-zero exit value 1
  This problem might be caused by incorrect test process configuration.
  Please refer to the test execution section in the User Manual at https://docs.gradle.org/7.4.2/userguide/java_testing.html#sec:test_execution

start gradle check

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

✅   Gradle Check success e085e53
Log 4191

Reports 4191

@tlfeng tlfeng merged commit 7aa496f into opensearch-project:main Apr 5, 2022
@tlfeng tlfeng deleted the manager-timeout-index-api branch April 5, 2022 17:47
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Apr 5, 2022
…_timeout' - in Index APIs except index template APIs (#2660)

- Deprecate the request parameter `master_timeout` that used in Index APIs which have got the parameter.
(except index template APIs, which is addressed in PR #2678)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 7aa496f)
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Apr 5, 2022
…_timeout' - in Index APIs except index template APIs (#2660)

- Deprecate the request parameter `master_timeout` that used in Index APIs which have got the parameter.
(except index template APIs, which is addressed in PR #2678)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 7aa496f)
tlfeng pushed a commit that referenced this pull request Apr 5, 2022
…_timeout' - in Index APIs except index template APIs (#2660) (#2770)

- Deprecate the request parameter `master_timeout` that used in Index APIs which have got the parameter.
(except index template APIs, which is addressed in PR #2678)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 7aa496f)
tlfeng pushed a commit that referenced this pull request Apr 5, 2022
…_timeout' - in Index APIs except index template APIs (#2660) (#2771)

- Deprecate the request parameter `master_timeout` that used in Index APIs which have got the parameter.
(except index template APIs, which is addressed in PR #2678)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 7aa496f)
tlfeng pushed a commit that referenced this pull request Apr 12, 2022
…r_timeout' - in Index Template APIs (#2678)

- Deprecate the request parameter `master_timeout` that used in Index Template APIs which have got the parameter. 
(The other Index APIs are addressed in PR #2660) 
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.
Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Apr 12, 2022
…r_timeout' - in Index Template APIs (#2678)

- Deprecate the request parameter `master_timeout` that used in Index Template APIs which have got the parameter.
(The other Index APIs are addressed in PR #2660)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.
Signed-off-by: Tianli Feng <ftianli@amazon.com>

(cherry picked from commit ba3ed8a)
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Apr 12, 2022
…r_timeout' - in Index Template APIs (#2678)

- Deprecate the request parameter `master_timeout` that used in Index Template APIs which have got the parameter.
(The other Index APIs are addressed in PR #2660)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.
Signed-off-by: Tianli Feng <ftianli@amazon.com>

(cherry picked from commit ba3ed8a)
tlfeng pushed a commit that referenced this pull request Apr 12, 2022
…r_timeout' - in Index Template APIs (#2678) (#2866)

- Deprecate the request parameter `master_timeout` that used in Index Template APIs which have got the parameter.
(The other Index APIs are addressed in PR #2660)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.
Signed-off-by: Tianli Feng <ftianli@amazon.com>

(cherry picked from commit ba3ed8a)
tlfeng pushed a commit that referenced this pull request Apr 12, 2022
…r_timeout' - in Index Template APIs (#2678) (#2867)

- Deprecate the request parameter `master_timeout` that used in Index Template APIs which have got the parameter.
(The other Index APIs are addressed in PR #2660)
- Add alternative new request parameter `cluster_manager_timeout`.
- Add unit tests.
Signed-off-by: Tianli Feng <ftianli@amazon.com>

(cherry picked from commit ba3ed8a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch enhancement Enhancement or improvement to existing feature or request v2.0.0 Version 2.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants