Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
ad9d6162
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
ad9d6162
编写于
9月 24, 2021
作者:
K
kezhenxu94
提交者:
GitHub
9月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add `socketTimeout` back to the new implementation (#7798)
上级
24aa9b1b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
1 deletion
+16
-1
oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
...ver/library/client/elasticsearch/ElasticSearchClient.java
+1
-0
oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java
...kywalking/library/elasticsearch/ElasticSearchBuilder.java
+9
-0
oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/bulk/BulkProcessor.java
.../skywalking/library/elasticsearch/bulk/BulkProcessor.java
+6
-1
未找到文件。
oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
浏览文件 @
ad9d6162
...
...
@@ -117,6 +117,7 @@ public class ElasticSearchClient implements Client, HealthCheckable {
.
endpoints
(
clusterNodes
.
split
(
","
))
.
protocol
(
protocol
)
.
connectTimeout
(
connectTimeout
)
.
socketTimeout
(
socketTimeout
)
.
numHttpClientThread
(
numHttpClientThread
)
.
healthyListener
(
healthy
->
{
if
(
healthy
)
{
...
...
oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java
浏览文件 @
ad9d6162
...
...
@@ -63,6 +63,8 @@ public final class ElasticSearchBuilder {
private
Duration
connectTimeout
=
Duration
.
ofMillis
(
500
);
private
Duration
socketTimeout
=
Duration
.
ofSeconds
(
30
);
private
Consumer
<
Boolean
>
healthyListener
;
private
int
numHttpClientThread
;
...
...
@@ -117,6 +119,12 @@ public final class ElasticSearchBuilder {
return
this
;
}
public
ElasticSearchBuilder
socketTimeout
(
int
socketTimeout
)
{
checkArgument
(
socketTimeout
>
0
,
"socketTimeout must be positive"
);
this
.
socketTimeout
=
Duration
.
ofMillis
(
socketTimeout
);
return
this
;
}
public
ElasticSearchBuilder
healthyListener
(
Consumer
<
Boolean
>
healthyListener
)
{
requireNonNull
(
healthyListener
,
"healthyListener"
);
this
.
healthyListener
=
healthyListener
;
...
...
@@ -138,6 +146,7 @@ public final class ElasticSearchBuilder {
final
ClientFactoryBuilder
factoryBuilder
=
ClientFactory
.
builder
()
.
connectTimeout
(
connectTimeout
)
.
idleTimeout
(
socketTimeout
)
.
useHttp2Preface
(
false
)
.
workerGroup
(
numHttpClientThread
>
0
?
numHttpClientThread
:
NUM_PROC
);
...
...
oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/bulk/BulkProcessor.java
浏览文件 @
ad9d6162
...
...
@@ -84,9 +84,10 @@ public final class BulkProcessor {
return
this
;
}
@SneakyThrows
private
void
internalAdd
(
Object
request
)
{
requireNonNull
(
request
,
"request"
);
requests
.
add
(
request
);
requests
.
put
(
request
);
flushIfNeeded
();
}
...
...
@@ -120,6 +121,10 @@ public final class BulkProcessor {
private
CompletableFuture
<
Void
>
doFlush
(
final
List
<
Object
>
batch
)
{
log
.
debug
(
"Executing bulk with {} requests"
,
batch
.
size
());
if
(
batch
.
isEmpty
())
{
return
CompletableFuture
.
completedFuture
(
null
);
}
final
CompletableFuture
<
Void
>
future
=
es
.
get
().
version
().
thenCompose
(
v
->
{
try
{
final
RequestFactory
rf
=
v
.
requestFactory
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录