caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!300 fix & improve

Browse Source 
Merge pull request !300 from OceansDeep/pg
This commit is contained in:
OceansDeep 2023-08-03 07:58:37 +00:00 committed by Gitee
commit a2a1bed3e0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
View File

@ -9,6 +9,7 @@ import org.apache.http.client.CredentialsProvider;
import org.apache.http.conn.ConnectionKeepAliveStrategy;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.apache.http.impl.nio.reactor.IOReactorConfig;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
@ -72,7 +73,12 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
CredentialsProvider credentialsProvider) {
httpClientBuilder
.setKeepAliveStrategy(getConnectionKeepAliveStrategy())
.setMaxConnPerRoute(10);
.setMaxConnPerRoute(10)
.setDefaultIOReactorConfig(
IOReactorConfig
.custom()
.setIoThreadCount(Runtime.getRuntime().availableProcessors())
.build());
if (credentialsProvider != null) {
httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}

5
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
View File

@ -455,8 +455,9 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
this.client.bulkAsync(request, RequestOptions.DEFAULT, new ActionListener<BulkResponse>() {
@Override
public void onResponse(BulkResponse bulkItemResponses) {
if (bulkItemResponses.hasFailures()) {
throw new RetryException("批量更新商品索引失败，es内容版本冲突");
log.info("批量更新商品索引结果：{}", bulkItemResponses.buildFailureMessage());
if (bulkItemResponses.hasFailures() && bulkItemResponses.getItems().length > 0) {
throw new RetryException("批量更新商品索引失败，" + bulkItemResponses.buildFailureMessage());
}
}