Skip to content
This repository has been archived by the owner on Aug 9, 2022. It is now read-only.

Cleaning up settings name, Stats URL and redacting node details #35

Merged
merged 7 commits into from
Feb 14, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ GET /_opendistro/_asynchronous_search/_stats
```

**Tunable Settings**
1. `opendistro_asynchronous_search.max_search_running_time` : Maximum running time for the search beyond which the search would be terminated
2. `opendistro_asynchronous_search.max_running_searches` : Concurrent searches running per coordinator node
3. `opendistro_asynchronous_search.max_keep_alive` : Maximum keep alive for search which dictates how long the search is allowed to be present in the cluster
4. `opendistro_asynchronous_search.max_wait_for_completion_timeout` : Maximum keep on completion to block for the search response
1. `opendistro.asynchronous_search.max_search_running_time` : Maximum running time for the search beyond which the search would be terminated
2. `opendistro.asynchronous_search.max_running_searches` : Concurrent searches running per coordinator node
3. `opendistro.asynchronous_search.max_keep_alive` : Maximum keep alive for search which dictates how long the search is allowed to be present in the cluster
4. `opendistro.asynchronous_search.max_wait_for_completion_timeout` : Maximum keep on completion to block for the search response
5. `opendistro.asynchronous_search.persist_search_failures` : Persist asynchronous search result ending with search failure in system index

## Setup

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ext {
}

group 'com.amazon.opendistroforelasticsearch'
version = "${opendistroVersion}.0"
version = "${opendistroVersion}.1"

sourceCompatibility = 1.9

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## 2021-02-13 Version 1.13.0.1
Compatible with Elasticsearch 7.10.2
### Maintenance
* Renamed settings for consistency with other ODFE plugins ([#35](https://github.com/opendistro-for-elasticsearch/asynchronous-search
/pull/35))
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class AsynchronousSearchActiveStore {
private volatile int maxRunningSearches;
public static final int DEFAULT_MAX_RUNNING_SEARCHES = 20;
public static final Setting<Integer> MAX_RUNNING_SEARCHES_SETTING = Setting.intSetting(
"opendistro_asynchronous_search.max_running_searches", DEFAULT_MAX_RUNNING_SEARCHES, 0, Setting.Property.Dynamic,
"opendistro.asynchronous_search.max_running_searches", DEFAULT_MAX_RUNNING_SEARCHES, 0, Setting.Property.Dynamic,
Copy link
Member

Choose a reason for hiding this comment

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

Should we rename this to node.max_running_searches

Copy link
Member

Choose a reason for hiding this comment

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

node_concurrent_running_searches to follow other setting conventions

Setting.Property.NodeScope);

private final ConcurrentMapLong<AsynchronousSearchActiveContext> activeContexts = newConcurrentMapLongWithAggressiveConcurrency();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ public class AsynchronousSearchManagementService extends AbstractLifecycleCompon
"indices:data/read/opendistro/asynchronous_search/response_cleanup";

public static final Setting<TimeValue> ACTIVE_CONTEXT_REAPER_INTERVAL_SETTING =
Setting.timeSetting("opendistro_asynchronous_search.active.context.reaper_interval", TimeValue.timeValueMinutes(5),
Setting.timeSetting("opendistro.asynchronous_search.active.context.reaper_interval", TimeValue.timeValueMinutes(5),
TimeValue.timeValueSeconds(5),
Setting.Property.NodeScope);
public static final Setting<TimeValue> PERSISTED_RESPONSE_CLEAN_UP_INTERVAL_SETTING =
Setting.timeSetting("opendistro_asynchronous_search.expired.persisted_response.cleanup_interval",
Setting.timeSetting("opendistro.asynchronous_search.expired.persisted_response.cleanup_interval",
TimeValue.timeValueMinutes(5), TimeValue.timeValueSeconds(5),
Setting.Property.NodeScope);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ public class AsynchronousSearchService extends AbstractLifecycleComponent implem
private static final Logger logger = LogManager.getLogger(AsynchronousSearchService.class);

public static final Setting<TimeValue> MAX_KEEP_ALIVE_SETTING =
Setting.positiveTimeSetting("opendistro_asynchronous_search.max_keep_alive", timeValueDays(5),
Setting.positiveTimeSetting("opendistro.asynchronous_search.max_keep_alive", timeValueDays(5),
Setting.Property.NodeScope, Setting.Property.Dynamic);
public static final Setting<TimeValue> MAX_SEARCH_RUNNING_TIME_SETTING =
Setting.positiveTimeSetting("opendistro_asynchronous_search.max_search_running_time", timeValueHours(12),
Setting.positiveTimeSetting("opendistro.asynchronous_search.max_search_running_time", timeValueHours(12),
Setting.Property.NodeScope, Setting.Property.Dynamic);
public static final Setting<TimeValue> MAX_WAIT_FOR_COMPLETION_TIMEOUT_SETTING = Setting.positiveTimeSetting(
"opendistro_asynchronous_search.max_wait_for_completion_timeout", timeValueMinutes(1), Setting.Property.NodeScope,
"opendistro.asynchronous_search.max_wait_for_completion_timeout", timeValueMinutes(1), Setting.Property.NodeScope,
Setting.Property.Dynamic);

public static final Setting<Boolean> PERSIST_SEARCH_FAILURES_SETTING =
Setting.boolSetting("opendistro_asynchronous_search.persist_search_failures", false,
Setting.boolSetting("opendistro.asynchronous_search.persist_search_failures", false,
Setting.Property.NodeScope, Setting.Property.Dynamic);

private volatile long maxKeepAlive;
Expand Down