Skip to content
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

Jump to bottom

Part 1: Support for cancel_after_timeinterval parameter in search and msearch request #986

Merged
merged 7 commits into from
Aug 12, 2021
Merged

Part 1: Support for cancel_after_timeinterval parameter in search and msearch request #986

merged 7 commits into from
Aug 12, 2021

Commits on Aug 11, 2021

  1. Part 1: Support for cancel_after_timeinterval parameter in search and… 

    … msearch request

This commit introduces the new request level parameter to configure the timeout interval after which
a search request will be cancelled. For msearch request the parameter is supported both at parent
request and at sub child search requests. If it is provided at parent level and child search request
doesn't have it then the parent level value is set at such child request. The parent level msearch
is not used to cancel the parent request as it may be tricky to come up with correct value in cases
when child search request can have different runtimes

TEST: Added test for ser/de with new parameter

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    Sorabh Hamirwasia authored and sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    ae7d1a4 View commit details
    Browse the repository at this point in the history

  2. Part 2: Support for cancel_after_timeinterval parameter in search and… 

    … msearch request

This commit adds the handling of the new request level parameter and schedule cancellation task. It
also adds a cluster setting to set a global cancellation timeout for search request which will be
used in absence of request level timeout.

TEST: Added new tests in SearchCancellationIT
Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    88ebfe4 View commit details
    Browse the repository at this point in the history

  3. Address Review feedback for Part 1 

    Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    fc28769 View commit details
    Browse the repository at this point in the history

  4. Address review feedback for Part 2 

    Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    03082f9 View commit details
    Browse the repository at this point in the history

  5. Update CancellableTask to remove the cancelOnTimeout boolean flag 

    Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    9851c29 View commit details
    Browse the repository at this point in the history

  6. Replace search.cancellation.timeout cluster setting with search.enfor… 

    …ce_server.timeout.cancellation to control if cluster level cancel_after_time_interval should take precedence over request level cancel_after_time_interval value

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    4adeb6e View commit details
    Browse the repository at this point in the history

  7. Removing the search.enforce_server.timeout.cancellation cluster setti… 

    …ng and just keeping search.cancel_after_time_interval setting with request level parameter taking the precedence.

Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com>
    @sohami
    sohami committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    cf11529 View commit details
    Browse the repository at this point in the history