Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
76013bc8
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
76013bc8
编写于
3月 13, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
3月 13, 2020
浏览文件
操作
浏览文件
下载
差异文件
!105 iSulad: only append exec for runtime non-lcr
Merge pull request !105 from lifeng_isula/fix_envs
上级
fdcdd1fb
9414410c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
44 addition
and
24 deletion
+44
-24
src/services/execution/execute/execution_stream.c
src/services/execution/execute/execution_stream.c
+44
-24
未找到文件。
src/services/execution/execute/execution_stream.c
浏览文件 @
76013bc8
...
...
@@ -356,39 +356,49 @@ out:
return
ret
;
}
static
int
merge_exec_process_env
(
defs_process
*
spec
,
const
container_config
*
container_spec
,
const
char
**
env
,
size_t
env_len
)
static
int
merge_exec_from_container_env
(
defs_process
*
spec
,
const
container_config
*
container_spec
)
{
int
ret
=
0
;
size_t
env_count
=
0
;
size_t
i
=
0
;
if
(
env_len
>
LIST_ENV_SIZE_MAX
-
container_
spec
->
env_len
)
{
if
(
container_spec
->
env_len
>
LIST_ENV_SIZE_MAX
-
spec
->
env_len
)
{
ERROR
(
"The length of envionment variables is too long, the limit is %d"
,
LIST_ENV_SIZE_MAX
);
isulad_set_error_message
(
"The length of envionment variables is too long, the limit is %d"
,
LIST_ENV_SIZE_MAX
);
ret
=
-
1
;
goto
out
;
}
env_count
=
container_spec
->
env_len
+
env_len
;
if
(
env_count
==
0
)
{
ret
=
0
;
goto
out
;
for
(
i
=
0
;
i
<
container_spec
->
env_len
;
i
++
)
{
ret
=
util_array_append
(
&
(
spec
->
env
),
container_spec
->
env
[
i
]);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to append container env to exec process env"
);
goto
out
;
}
spec
->
env_len
++
;
}
spec
->
env
=
util_common_calloc_s
(
env_count
*
sizeof
(
char
*
));
if
(
spec
->
env
==
NULL
)
{
ERROR
(
"Failed to malloc memory for envionment variables"
);
out:
return
ret
;
}
static
int
merge_envs_from_request_env
(
defs_process
*
spec
,
const
char
**
envs
,
size_t
env_len
)
{
int
ret
=
0
;
size_t
i
=
0
;
if
(
env_len
>
LIST_ENV_SIZE_MAX
-
spec
->
env_len
)
{
ERROR
(
"The length of envionment variables is too long, the limit is %d"
,
LIST_ENV_SIZE_MAX
);
isulad_set_error_message
(
"The length of envionment variables is too long, the limit is %d"
,
LIST_ENV_SIZE_MAX
);
ret
=
-
1
;
goto
out
;
}
for
(
i
=
0
;
i
<
container_spec
->
env_len
;
i
++
)
{
spec
->
env
[
spec
->
env_len
]
=
util_strdup_s
(
container_spec
->
env
[
i
]);
spec
->
env_len
++
;
}
for
(
i
=
0
;
i
<
env_len
;
i
++
)
{
spec
->
env
[
spec
->
env_len
]
=
util_strdup_s
(
env
[
i
]);
ret
=
util_array_append
(
&
(
spec
->
env
),
envs
[
i
]);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to append request env to exec process env"
);
goto
out
;
}
spec
->
env_len
++
;
}
...
...
@@ -433,7 +443,7 @@ out:
}
static
defs_process
*
make_exec_process_spec
(
const
container_config
*
container_spec
,
defs_process_user
*
puser
,
const
container_exec_request
*
request
)
const
c
har
*
runtime
,
const
c
ontainer_exec_request
*
request
)
{
int
ret
=
0
;
defs_process
*
spec
=
NULL
;
...
...
@@ -443,16 +453,26 @@ static defs_process *make_exec_process_spec(const container_config *container_sp
return
NULL
;
}
ret
=
merge_exec_process_env
(
spec
,
container_spec
,
(
const
char
**
)
request
->
env
,
request
->
env_len
);
if
(
strcasecmp
(
runtime
,
"lcr"
)
!=
0
)
{
ret
=
merge_exec_from_container_env
(
spec
,
container_spec
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to dup args for exec process spec"
);
goto
err_out
;
}
}
ret
=
merge_envs_from_request_env
(
spec
,
(
const
char
**
)
request
->
env
,
request
->
env_len
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to dup args for exec process spec"
);
goto
err_out
;
}
ret
=
append_necessary_process_env
(
request
->
tty
,
container_spec
,
spec
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to append necessary for exec process spec"
);
goto
err_out
;
if
(
strcasecmp
(
runtime
,
"lcr"
)
!=
0
)
{
ret
=
append_necessary_process_env
(
request
->
tty
,
container_spec
,
spec
);
if
(
ret
!=
0
)
{
ERROR
(
"Failed to append necessary for exec process spec"
);
goto
err_out
;
}
}
ret
=
dup_array_of_strings
((
const
char
**
)
request
->
argv
,
request
->
argv_len
,
&
(
spec
->
args
),
&
(
spec
->
args_len
));
...
...
@@ -507,7 +527,7 @@ static int exec_container(container_t *cont, const char *runtime, char * const c
goto
out
;
}
process_spec
=
make_exec_process_spec
(
cont
->
common_config
->
config
,
puser
,
request
);
process_spec
=
make_exec_process_spec
(
cont
->
common_config
->
config
,
puser
,
r
untime
,
r
equest
);
if
(
process_spec
==
NULL
)
{
ERROR
(
"Exec: Failed to make process spec"
);
ret
=
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录