0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1590 fix index.scroll.search.timeout

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-04-05 16:59:09 +09:00
parent 1691d871c1
commit 1cb631adda
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -644,8 +644,7 @@ public class FessEsClient implements Client {
SearchResponse response =
client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
.setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute()
.actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
int count = 0;
String scrollId = response.getScrollId();

12
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -531,7 +531,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
String INDEX_SEARCH_TIMEOUT = "index.search.timeout";
/** The key of the configuration. e.g. 3m */
String INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT = "index.scroll.search.timeout.timeout";
String INDEX_SCROLL_SEARCH_TIMEOUT = "index.scroll.search.timeout";
/** The key of the configuration. e.g. 3m */
String INDEX_INDEX_TIMEOUT = "index.index.timeout";
@ -2873,11 +2873,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
String getIndexSearchTimeout();
/**
* Get the value for the key 'index.scroll.search.timeout.timeout'. <br>
* Get the value for the key 'index.scroll.search.timeout'. <br>
* The value is, e.g. 3m <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getIndexScrollSearchTimeoutTimeout();
String getIndexScrollSearchTimeout();
/**
* Get the value for the key 'index.index.timeout'. <br>
@ -6489,8 +6489,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.INDEX_SEARCH_TIMEOUT);
}
public String getIndexScrollSearchTimeoutTimeout() {
return get(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT);
public String getIndexScrollSearchTimeout() {
return get(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT);
}
public String getIndexIndexTimeout() {
@ -8156,7 +8156,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_ADMIN_DOUBLE_FIELDS, "");
defaultMap.put(FessConfig.INDEX_ADMIN_REQUIRED_FIELDS, "url,title,role,boost");
defaultMap.put(FessConfig.INDEX_SEARCH_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_SCROLL_SEARCH_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_INDEX_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_BULK_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_DELETE_TIMEOUT, "3m");

2
src/main/resources/fess_config.properties
View file

@ -271,7 +271,7 @@ index.admin.required.fields=url,title,role,boost
# timeout
index.search.timeout=3m
index.scroll.search.timeout.timeout=3m
index.scroll.search.timeout=3m
index.index.timeout=3m
index.bulk.timeout=3m
index.delete.timeout=3m