Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
clmforever
oceanbase
提交
49cdaf51
O
oceanbase
项目概览
clmforever
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
49cdaf51
编写于
7月 30, 2021
作者:
H
hiddenbomb
提交者:
wangzelin.wzl
7月 30, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
retry io_getevents if we meet EINTR due to interruption from pstack/obstack
上级
a331dec5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
9 deletion
+19
-9
deps/oblib/src/lib/io/ob_io_common.cpp
deps/oblib/src/lib/io/ob_io_common.cpp
+16
-9
deps/oblib/src/lib/io/ob_io_common.h
deps/oblib/src/lib/io/ob_io_common.h
+3
-0
未找到文件。
deps/oblib/src/lib/io/ob_io_common.cpp
浏览文件 @
49cdaf51
...
...
@@ -95,22 +95,22 @@ int ob_io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event*
#ifdef ERRSIM
ret
=
E
(
EventTable
::
EN_IO_GETEVENTS
)
OB_SUCCESS
;
if
(
OB_SUCC
(
ret
))
{
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents
_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
}
else
{
if
(
OB_IO_ERROR
==
ret
)
{
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents
_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
for
(
int64_t
i
=
0
;
i
<
ret
;
++
i
)
{
events
[
i
].
res
=
1
;
}
}
else
if
(
OB_TIMEOUT
==
ret
)
{
sleep
(
1
);
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents
_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
}
else
if
(
OB_AIO_TIMEOUT
==
ret
)
{
// ignore real return
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
0
;
}
else
if
(
OB_EAGAIN
==
ret
)
{
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents
_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
if
(
ret
>=
1
)
{
// random make 1 event fail
int64_t
idx
=
common
::
ObRandom
::
rand
(
1
,
ret
)
-
1
;
...
...
@@ -118,20 +118,27 @@ int ob_io_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event*
}
}
else
if
(
OB_RESOURCE_OUT
==
ret
)
{
// OB_CS_OUTOF_DISK_SPACE is not defined in lib/ob_errno.h, use OB_RESOURCE_OUT to represent
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
ret
=
io_getevents
_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
for
(
int64_t
i
=
0
;
i
<
ret
;
++
i
)
{
events
[
i
].
res2
=
-
ENOSPC
;
}
}
}
#else
// ignore EINTR and retry
while
((
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
))
<
0
&&
-
EINTR
==
ret
)
;
ret
=
io_getevents_with_retry
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
);
#endif
return
ret
;
}
int
io_getevents_with_retry
(
io_context_t
ctx_id
,
long
min_nr
,
long
nr
,
struct
io_event
*
events
,
struct
timespec
*
timeout
)
{
int
ret
=
0
;
// ignore EINTR and retry
while
((
ret
=
io_getevents
(
ctx_id
,
min_nr
,
nr
,
events
,
timeout
))
<
0
&&
-
EINTR
==
ret
)
{}
return
ret
;
}
void
align_offset_size
(
const
int64_t
offset
,
const
int64_t
size
,
int64_t
&
align_offset
,
int64_t
&
align_size
)
{
align_offset
=
lower_align
(
offset
,
DIO_READ_ALIGN_SIZE
);
...
...
deps/oblib/src/lib/io/ob_io_common.h
浏览文件 @
49cdaf51
...
...
@@ -50,6 +50,9 @@ extern int ob_io_cancel(io_context_t ctx, struct iocb* iocb, struct io_event* ev
extern
int
ob_io_getevents
(
io_context_t
ctx_id
,
long
min_nr
,
long
nr
,
struct
io_event
*
events
,
struct
timespec
*
timeout
);
int
io_getevents_with_retry
(
io_context_t
ctx_id
,
long
min_nr
,
long
nr
,
struct
io_event
*
events
,
struct
timespec
*
timeout
);
void
align_offset_size
(
const
int64_t
offset
,
const
int64_t
size
,
int64_t
&
align_offset
,
int64_t
&
align_size
);
enum
ObIOMode
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录