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.

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

Add global search timeout setting #12211

Merged
merged 1 commit into from Jul 17, 2015
Merged

Add global search timeout setting #12211

merged 1 commit into from Jul 17, 2015

Conversation

jasontedor
Copy link
Member

This commit adds a dynamically updatable cluster-level search timeout setting. Additionally, some other search settings were moved to
org.elasticsearch.search.SearchSettings.

Closes #12149

@@ -148,10 +145,11 @@
private final ParseFieldMatcher parseFieldMatcher;

@Inject
public SearchService(Settings settings, ClusterService clusterService, IndicesService indicesService,IndicesWarmer indicesWarmer, ThreadPool threadPool,
public SearchService(Settings settings, SearchSettings searchSettings, ClusterService clusterService, IndicesService indicesService,IndicesWarmer indicesWarmer, ThreadPool threadPool,
Copy link
Contributor

Choose a reason for hiding this comment

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

can we just fold SearchSettings into SearchService we already have enough classes and abstractions I don't think we need another one.

@s1monw
Copy link
Contributor

s1monw commented Jul 13, 2015

I left some comments, thanks @jasontedor

@clintongormley clintongormley added :Search/Search Search-related issues that do not fall into other categories and removed :Analytics/Aggregations Aggregations labels Jul 14, 2015
This commit adds a dynamically updatable cluster-level search timeout setting.

Closes #12149
@jasontedor
Copy link
Member Author

@s1monw @jpountz I've updated the pull request to reflect the comments regarding introducing a new class.

@@ -90,7 +91,7 @@
private ScanContext scanContext;
private float queryBoost = 1.0f;
// timeout in millis
private long timeoutInMillis = -1;
private long timeoutInMillis;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can it be final?

Copy link
Contributor

Choose a reason for hiding this comment

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

oh nevermind :)

@jpountz
Copy link
Contributor

jpountz commented Jul 17, 2015

LGTM

jasontedor added a commit that referenced this pull request Jul 17, 2015
Add global search timeout setting
@jasontedor jasontedor merged commit e379d20 into elastic:master Jul 17, 2015
@jasontedor jasontedor deleted the features/12149 branch July 17, 2015 13:23
@jasontedor jasontedor removed the review label Jul 17, 2015
jasontedor added a commit that referenced this pull request Jan 7, 2016
Add documentation for global search timeout

Relates #12211
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement :Search/Search Search-related issues that do not fall into other categories v2.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants