packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
iSulad/0155-2258-rollback-commit-for-update-possible-changed-res.patch
openeuler-sync-bot 955d185c18 !645 [sync] PR-641: upgrade from upstream 
* upgrade from upstream
2023-12-22 01:09:39 +00:00

783 lines
30 KiB
Diff
Raw Permalink Blame History

From 131f59ea3175166143a56f92a018322548e73a44 Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Tue, 21 Nov 2023 02:02:07 +0000
Subject: [PATCH 155/181] !2258 rollback commit for update possible changed
resources for oci spec * rollback commit for update possible changed
resources for oci spec
---
.../container_cases/dev_cgroup_rule.sh | 50 +------
CI/test_cases/container_cases/ulimit.sh | 13 --
src/cmd/isulad/main.c | 13 +-
src/daemon/config/isulad_config.c | 6 +-
src/daemon/modules/api/specs_api.h | 11 +-
.../container/container_events_handler.c | 2 +-
.../modules/service/service_container.c | 68 ++-------
src/daemon/modules/spec/specs.c | 115 ++++++---------
src/daemon/modules/spec/specs_mount.c | 133 +++---------------
src/daemon/modules/spec/specs_mount.h | 6 +-
.../image/oci/oci_config_merge/CMakeLists.txt | 4 -
11 files changed, 84 insertions(+), 337 deletions(-)
diff --git a/CI/test_cases/container_cases/dev_cgroup_rule.sh b/CI/test_cases/container_cases/dev_cgroup_rule.sh
index 839a546c..651433c0 100755
--- a/CI/test_cases/container_cases/dev_cgroup_rule.sh
+++ b/CI/test_cases/container_cases/dev_cgroup_rule.sh
@@ -25,10 +25,8 @@ source ../helpers.sh
function test_cpu_dev_cgoup_rule_spec()
{
local ret=0
- local runtime=$1
local image="busybox"
- local test="container device cgroup rule test with (${runtime}) => (${FUNCNAME[@]})"
- local test_dev="/dev/testA"
+ local test="container device cgroup rule test => (${FUNCNAME[@]})"
msg_info "${test} starting..."
@@ -38,47 +36,6 @@ function test_cpu_dev_cgoup_rule_spec()
isula images | grep busybox
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - missing list image: ${image}" && ((ret++))
- rm -f $test_dev
- priv_cid=$(isula run -tid --privileged --runtime $runtime $image /bin/sh)
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - run priviledged container failed" && ((ret++))
- priv_major_88_cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$priv_cid/config.json | grep "major\": 88" | wc -l)
- priv_minor_88_cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$priv_cid/config.json | grep "minor\": 88" | wc -l)
-
- mknod $test_dev c 88 88
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - mknod failed" && ((ret++))
- isula restart -t 0 $priv_cid
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - restart priviledge container failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$priv_cid/config.json | grep "major\": 88" | wc -l)
- [[ $? -ne 0 ]]&& [[ $cnt -le $priv_major_88_cnt ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device major failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$priv_cid/config.json | grep "minor\": 88" | wc -l)
- [[ $? -ne 0 ]] && [[ $cnt -le $priv_minor_88_cnt ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device minor failed" && ((ret++))
- isula rm -f $priv_cid
-
- cid=$(isula run -tid --device "$test_dev:$test_dev" --runtime $runtime $image /bin/sh)
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - run container failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "major\": 88" | wc -l)
- [[ $? -ne 0 ]]&& [[ $cnt -ne 2 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device major failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "minor\": 88" | wc -l)
- [[ $? -ne 0 ]] && [[ $cnt -ne 2 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device minor failed" && ((ret++))
- isula exec -it $cid sh -c "cat /sys/fs/cgroup/devices/devices.list" | grep "c 88:88 rwm"
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to check c 88:88 rwm: ${image}" && ((ret++))
- isula stop -t 0 $cid
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - stop container failed" && ((ret++))
- rm -f $test_dev
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - rm device failed" && ((ret++))
- mknod $test_dev c 99 99
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - mknod failed" && ((ret++))
- isula start $cid
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - start container failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "major\": 99" | wc -l)
- [[ $? -ne 0 ]]&& [[ $cnt -ne 2 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device major failed" && ((ret++))
- cnt=$(cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "minor\": 99" | wc -l)
- [[ $? -ne 0 ]] && [[ $cnt -ne 2 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check device minor failed" && ((ret++))
- isula exec -it $cid sh -c "cat /sys/fs/cgroup/devices/devices.list" | grep "c 99:99 rwm"
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to check c 99:99 rwm: ${image}" && ((ret++))
- isula rm -f $cid
- rm -f $test_dev
-
isula run -itd --device-cgroup-rule='b *:*' busybox 2>&1 | grep "Invalid value"
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - Invalid value" && ((ret++))
@@ -136,9 +93,6 @@ function test_cpu_dev_cgoup_rule_spec()
declare -i ans=0
-for element in ${RUNTIME_LIST[@]};
-do
- test_cpu_dev_cgoup_rule_spec $element || ((ans++))
-done
+test_cpu_dev_cgoup_rule_spec || ((ans++))
show_result ${ans} "${curr_path}/${0}"
diff --git a/CI/test_cases/container_cases/ulimit.sh b/CI/test_cases/container_cases/ulimit.sh
index f823dc1c..29868041 100755
--- a/CI/test_cases/container_cases/ulimit.sh
+++ b/CI/test_cases/container_cases/ulimit.sh
@@ -33,25 +33,12 @@ function test_ulimit()
local test="ulimit test with (${runtime})=> (${FUNCNAME[@]})"
msg_info "${test} starting..."
- cid=$(isula run -tid --runtime $runtime $image /bin/sh)
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check failed" && ((ret++))
- cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "RLIMIT_"
- [[ $? -eq 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check rlimit failed" && ((ret++))
-
check_valgrind_log
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - stop isulad failed" && ((ret++))
start_isulad_with_valgrind --default-ulimit nproc=2048:4096 --default-ulimit nproc=2048:8192 --default-ulimit nofile=1024:4096
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - start isulad failed" && ((ret++))
- # if default ulimit of isulad changed, isula start should do update ulimit of oci spec
- isula restart -t 0 $cid
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - restart failed" && ((ret++))
- cat ${RUNTIME_ROOT_PATH}/${runtime}/$cid/config.json | grep "RLIMIT_"
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check rlimit failed after restart" && ((ret++))
- isula rm -f $cid
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - rm container failed" && ((ret++))
-
isula run --ulimit nproc= $image --runtime $runtime /bin/sh > $ulimitlog 2>&1
cat $ulimitlog | grep "delimiter '=' can't be the first or the last character"
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - check failed" && ((ret++))
diff --git a/src/cmd/isulad/main.c b/src/cmd/isulad/main.c
index 8d4d886b..e624cfdd 100644
--- a/src/cmd/isulad/main.c
+++ b/src/cmd/isulad/main.c
@@ -1319,7 +1319,7 @@ static int ensure_isulad_tmpdir_security()
if (do_ensure_isulad_tmpdir_security("/tmp") != 0) {
WARN("Failed to ensure the /tmp directory is a safe directory");
}
-
+
return 0;
}
@@ -1371,17 +1371,12 @@ static int isulad_server_init_common()
goto out;
}
- if (spec_module_init() != 0) {
- ERROR("Failed to init spec module");
- goto out;
- }
-
- if (containers_store_init() != 0) {
+ if (containers_store_init()) {
ERROR("Failed to init containers store");
goto out;
}
- if (container_name_index_init() != 0) {
+ if (container_name_index_init()) {
ERROR("Failed to init name index");
goto out;
}
@@ -1787,7 +1782,7 @@ int main(int argc, char **argv)
msg = "Failed to init plugin_manager";
goto failure;
}
-#endif
+#endif
clock_gettime(CLOCK_MONOTONIC, &t_end);
use_time = (double)(t_end.tv_sec - t_start.tv_sec) * (double)1000000000 + (double)(t_end.tv_nsec - t_start.tv_nsec);
diff --git a/src/daemon/config/isulad_config.c b/src/daemon/config/isulad_config.c
index ce2ae1c1..0e389dd1 100644
--- a/src/daemon/config/isulad_config.c
+++ b/src/daemon/config/isulad_config.c
@@ -998,7 +998,7 @@ static defs_hook *hooks_elem_dup(const defs_hook *src)
dest = (defs_hook *)util_common_calloc_s(sizeof(defs_hook));
if (dest == NULL) {
ERROR("Out of memory");
- return NULL;
+ return NULL;
}
dest->path = util_strdup_s(src->path);
@@ -1046,7 +1046,7 @@ static int hooks_array_dup(const defs_hook **src, const size_t src_len, defs_hoo
return -1;
}
- for (i = 0; i < src_len; i++) {
+ for(i = 0; i < src_len; i++) {
tmp_dst[i] = hooks_elem_dup(src[i]);
if (tmp_dst[i] == NULL) {
ERROR("Failed to duplicate hooks element");
@@ -1060,7 +1060,7 @@ static int hooks_array_dup(const defs_hook **src, const size_t src_len, defs_hoo
return 0;
err_out:
- for (i = 0; i < tmp_len; i++) {
+ for(i = 0; i < tmp_len; i++) {
free_defs_hook(tmp_dst[i]);
}
free(tmp_dst);
diff --git a/src/daemon/modules/api/specs_api.h b/src/daemon/modules/api/specs_api.h
index 1a6af9ae..0a594d81 100644
--- a/src/daemon/modules/api/specs_api.h
+++ b/src/daemon/modules/api/specs_api.h
@@ -29,7 +29,8 @@ int merge_all_specs(host_config *host_spec, const char *real_rootfs, container_c
oci_runtime_spec *oci_spec);
char *merge_container_cgroups_path(const char *id, const host_config *host_spec);
int merge_global_config(oci_runtime_spec *oci_spec);
-
+oci_runtime_spec *load_oci_config(const char *rootpath, const char *name);
+oci_runtime_spec *default_spec(bool system_container);
int merge_conf_cgroup(oci_runtime_spec *oci_spec, const host_config *host_spec);
int save_oci_config(const char *id, const char *rootpath, const oci_runtime_spec *oci_spec);
@@ -39,14 +40,6 @@ int parse_security_opt(const host_config *host_spec, bool *no_new_privileges, ch
int merge_share_namespace(oci_runtime_spec *oci_spec, const host_config *host_spec,
const container_config_v2_common_config_network_settings *network_settings);
-oci_runtime_spec *load_oci_config(const char *rootpath, const char *name);
-
-oci_runtime_spec *default_spec(bool system_container);
-
-const oci_runtime_spec *get_readonly_default_oci_spec(bool system_container);
-
-int spec_module_init(void);
-
#ifdef __cplusplus
}
#endif
diff --git a/src/daemon/modules/container/container_events_handler.c b/src/daemon/modules/container/container_events_handler.c
index 6a223bd2..d56c2ee0 100644
--- a/src/daemon/modules/container/container_events_handler.c
+++ b/src/daemon/modules/container/container_events_handler.c
@@ -157,7 +157,7 @@ static int container_state_changed(container_t *cont, const struct isulad_events
container_wait_stop_cond_broadcast(cont);
#ifdef ENABLE_PLUGIN
plugin_event_container_post_stop(cont);
-#endif
+#endif
}
auto_remove = !should_restart && cont->hostconfig != NULL && cont->hostconfig->auto_remove;
diff --git a/src/daemon/modules/service/service_container.c b/src/daemon/modules/service/service_container.c
index a5c12862..58b27f90 100644
--- a/src/daemon/modules/service/service_container.c
+++ b/src/daemon/modules/service/service_container.c
@@ -13,11 +13,19 @@
* Description: provide container supervisor functions
******************************************************************************/
#define _GNU_SOURCE
+#include <sys/stat.h>
#include <unistd.h>
#include <sys/mount.h>
#include <sys/eventfd.h>
#include <errno.h>
#include <fcntl.h>
+#include <isula_libutils/container_config.h>
+#include <isula_libutils/container_config_v2.h>
+#include <isula_libutils/container_exec_request.h>
+#include <isula_libutils/container_exec_response.h>
+#include <isula_libutils/defs.h>
+#include <isula_libutils/host_config.h>
+#include <isula_libutils/oci_runtime_spec.h>
#include <limits.h>
#include <pthread.h>
#include <signal.h>
@@ -27,28 +35,15 @@
#include <stdlib.h>
#include <string.h>
#include <strings.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/eventfd.h>
-#include <sys/epoll.h>
-
-#include <isula_libutils/container_config.h>
-#include <isula_libutils/container_config_v2.h>
-#include <isula_libutils/container_exec_request.h>
-#include <isula_libutils/container_exec_response.h>
-#include <isula_libutils/defs.h>
-#include <isula_libutils/host_config.h>
-#include <isula_libutils/oci_runtime_spec.h>
-#include <isula_libutils/log.h>
#include "service_container_api.h"
+#include "isula_libutils/log.h"
#include "utils.h"
#include "err_msg.h"
#include "events_sender_api.h"
#include "image_api.h"
#include "specs_api.h"
#include "specs_mount.h"
-#include "specs_extend.h"
#include "isulad_config.h"
#include "verify.h"
#include "plugin_api.h"
@@ -683,43 +678,6 @@ out:
epoll_loop_close(&descr);
}
-static int do_oci_spec_update(const char *id, oci_runtime_spec *oci_spec, host_config *hostconfig)
-{
- char *cgroup_parent = NULL;
- int ret;
-
- // If isulad daemon cgroup parent updated, we should update this config into oci spec
- cgroup_parent = merge_container_cgroups_path(id, hostconfig);
- if (cgroup_parent == NULL) {
- return -1;
- }
- if (oci_spec->linux->cgroups_path != NULL && strcmp(oci_spec->linux->cgroups_path, cgroup_parent) != 0) {
- free(oci_spec->linux->cgroups_path);
- oci_spec->linux->cgroups_path = cgroup_parent;
- cgroup_parent = NULL;
- }
- free(cgroup_parent);
-
- // For Linux.Resources, isula update will save changes into oci spec;
- // so we just skip it;
-
- // Remove old devices and update all devices
- ret = update_devcies_for_oci_spec(oci_spec, hostconfig);
- if (ret != 0) {
- ERROR("Failed to do update devices for oci spec");
- return -1;
- }
-
- // If isulad daemon ulimit updated, we should update this config into oci spec.
- if (merge_global_ulimit(oci_spec) != 0) {
- return -1;
- }
-
- // renew_oci_config() will update process->user and share namespace after.
-
- return 0;
-}
-
static int do_start_container(container_t *cont, const char *console_fifos[], bool reset_rm, pid_ppid_info_t *pid_info)
{
int ret = 0;
@@ -794,14 +752,6 @@ static int do_start_container(container_t *cont, const char *console_fifos[], bo
goto close_exit_fd;
}
- // Update possible changes
- nret = do_oci_spec_update(id, oci_spec, cont->hostconfig);
- if (nret != 0) {
- ERROR("Failed to update possible changes for oci spec");
- ret = -1;
- goto close_exit_fd;
- }
-
nret = setup_ipc_dirs(cont->hostconfig, cont->common_config);
if (nret != 0) {
ERROR("Failed to setup ipc dirs");
diff --git a/src/daemon/modules/spec/specs.c b/src/daemon/modules/spec/specs.c
index a8912c96..0c7d58b3 100644
--- a/src/daemon/modules/spec/specs.c
+++ b/src/daemon/modules/spec/specs.c
@@ -17,8 +17,6 @@
#include <stdio.h>
#include <stdbool.h>
#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
#include <isula_libutils/container_config.h>
#include <isula_libutils/container_config_v2.h>
#include <isula_libutils/defs.h>
@@ -78,13 +76,6 @@
#define CLONE_NEWCGROUP 0x02000000
#endif
-struct readonly_default_oci_spec {
- oci_runtime_spec *cont;
- oci_runtime_spec *system_cont;
-};
-
-static struct readonly_default_oci_spec g_rdspec;
-
static int make_sure_oci_spec_annotations(oci_runtime_spec *oci_spec)
{
if (oci_spec->annotations == NULL) {
@@ -386,6 +377,29 @@ out:
return ret;
}
+/* default_spec returns default oci spec used by isulad. */
+oci_runtime_spec *default_spec(bool system_container)
+{
+ const char *oci_file = OCICONFIG_PATH;
+ if (system_container) {
+ oci_file = OCI_SYSTEM_CONTAINER_CONFIG_PATH;
+ }
+ oci_runtime_spec *oci_spec = NULL;
+ parser_error err = NULL;
+
+ /* parse the input oci file */
+ oci_spec = oci_runtime_spec_parse_file(oci_file, NULL, &err);
+ if (oci_spec == NULL) {
+ ERROR("Failed to parse OCI specification file \"%s\", error message: %s", oci_file, err);
+ isulad_set_error_message("Can not read the default /etc/default/isulad/config.json file: %s", err);
+ goto out;
+ }
+
+out:
+ free(err);
+ return oci_spec;
+}
+
static int make_sure_oci_spec_root(oci_runtime_spec *oci_spec)
{
if (oci_spec->root == NULL) {
@@ -1697,20 +1711,20 @@ static int merge_resources_conf(oci_runtime_spec *oci_spec, host_config *host_sp
ret = merge_conf_cgroup(oci_spec, host_spec);
if (ret != 0) {
- return -1;
+ goto out;
}
- ret = merge_conf_blkio_device(oci_spec, host_spec);
+ ret = merge_conf_device(oci_spec, host_spec);
if (ret != 0) {
- return -1;
+ goto out;
}
- ret = merge_conf_devices(oci_spec, host_spec);
- if (ret != 0) {
- return -1;
+ ret = merge_conf_mounts(oci_spec, host_spec, v2_spec);
+ if (ret) {
+ goto out;
}
-
- return merge_conf_mounts(oci_spec, host_spec, v2_spec);
+out:
+ return ret;
}
static int merge_terminal(oci_runtime_spec *oci_spec, bool terminal)
@@ -2265,7 +2279,7 @@ oci_runtime_spec *load_oci_config(const char *rootpath, const char *name)
nret = snprintf(filename, sizeof(filename), "%s/%s/%s", rootpath, name, OCI_CONFIG_JSON);
if (nret < 0 || (size_t)nret >= sizeof(filename)) {
ERROR("Failed to print string");
- return NULL;
+ goto out;
}
ociconfig = oci_runtime_spec_parse_file(filename, NULL, &err);
@@ -2274,7 +2288,6 @@ oci_runtime_spec *load_oci_config(const char *rootpath, const char *name)
isulad_set_error_message("Parse oci config file failed:%s", err);
goto out;
}
-
out:
free(err);
return ociconfig;
@@ -2282,80 +2295,36 @@ out:
int save_oci_config(const char *id, const char *rootpath, const oci_runtime_spec *oci_spec)
{
+ int ret = 0;
int nret = 0;
+ char *json_container = NULL;
char file_path[PATH_MAX] = { 0x0 };
struct parser_context ctx = { OPT_PARSE_STRICT, stderr };
- char *json_container = NULL;
parser_error err = NULL;
- int ret = 0;
nret = snprintf(file_path, PATH_MAX, "%s/%s/%s", rootpath, id, OCI_CONFIG_JSON);
if (nret < 0 || (size_t)nret >= PATH_MAX) {
ERROR("Failed to print string");
- return -1;
+ ret = -1;
+ goto out_free;
}
json_container = oci_runtime_spec_generate_json(oci_spec, &ctx, &err);
if (json_container == NULL) {
ERROR("Failed to generate json: %s", err);
ret = -1;
- goto out;
+ goto out_free;
}
- nret = util_atomic_write_file(file_path, json_container, strlen(json_container), DEFAULT_SECURE_FILE_MODE, false);
- if (nret != 0) {
+ if (util_atomic_write_file(file_path, json_container, strlen(json_container), DEFAULT_SECURE_FILE_MODE, false) !=
+ 0) {
SYSERROR("write json container failed");
ret = -1;
- goto out;
+ goto out_free;
}
-out:
- free(json_container);
+out_free:
free(err);
+ free(json_container);
return ret;
}
-
-/* default_spec returns default oci spec used by isulad. */
-oci_runtime_spec *default_spec(bool system_container)
-{
- const char *oci_file = OCICONFIG_PATH;
- if (system_container) {
- oci_file = OCI_SYSTEM_CONTAINER_CONFIG_PATH;
- }
- oci_runtime_spec *oci_spec = NULL;
- parser_error err = NULL;
-
- /* parse the input oci file */
- oci_spec = oci_runtime_spec_parse_file(oci_file, NULL, &err);
- if (oci_spec == NULL) {
- ERROR("Failed to parse OCI specification file \"%s\", error message: %s", oci_file, err);
- isulad_set_error_message("Can not read the default %s file: %s", oci_file, err);
- goto out;
- }
-
-out:
- free(err);
- return oci_spec;
-}
-
-const oci_runtime_spec *get_readonly_default_oci_spec(bool system_container)
-{
- if (system_container) {
- return g_rdspec.system_cont;
- }
-
- return g_rdspec.cont;
-}
-
-int spec_module_init(void)
-{
- g_rdspec.cont = default_spec(false);
- if (g_rdspec.cont == NULL) {
- return -1;
- }
- g_rdspec.system_cont = default_spec(true);
- if (g_rdspec.system_cont == NULL) {
- return -1;
- }
- return 0;
-}
\ No newline at end of file
diff --git a/src/daemon/modules/spec/specs_mount.c b/src/daemon/modules/spec/specs_mount.c
index bb2b200a..cd3a5c9d 100644
--- a/src/daemon/modules/spec/specs_mount.c
+++ b/src/daemon/modules/spec/specs_mount.c
@@ -53,7 +53,6 @@
#include "image_api.h"
#include "volume_api.h"
#include "parse_volume.h"
-#include "specs_api.h"
enum update_rw {
update_rw_untouch,
@@ -2213,24 +2212,7 @@ out:
return ret;
}
-int merge_conf_devices(oci_runtime_spec *oci_spec, host_config *host_spec)
-{
- /* devices which will be populated into container */
- if (merge_conf_populate_device(oci_spec, host_spec)) {
- ERROR("Merge user define devices failed");
- return -1;
- }
-
- /* device cgroup rules which will be added into container */
- if (merge_conf_device_cgroup_rule(oci_spec, host_spec)) {
- ERROR("Merge user define device cgroup rules failed");
- return -1;
- }
-
- return 0;
-}
-
-int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
+int merge_conf_device(oci_runtime_spec *oci_spec, host_config *host_spec)
{
int ret = 0;
@@ -2244,7 +2226,7 @@ int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
ret = merge_blkio_weight_device(oci_spec, host_spec->blkio_weight_device, host_spec->blkio_weight_device_len);
if (ret != 0) {
ERROR("Failed to merge blkio weight devices");
- return -1;
+ goto out;
}
}
@@ -2254,7 +2236,7 @@ int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
host_spec->blkio_device_read_bps_len);
if (ret != 0) {
ERROR("Failed to merge blkio read bps devices");
- return -1;
+ goto out;
}
}
@@ -2264,7 +2246,7 @@ int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
host_spec->blkio_device_write_bps_len);
if (ret != 0) {
ERROR("Failed to merge blkio write bps devices");
- return -1;
+ goto out;
}
}
@@ -2274,7 +2256,7 @@ int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
host_spec->blkio_device_read_iops_len);
if (ret != 0) {
ERROR("Failed to merge blkio read iops devices");
- return -1;
+ goto out;
}
}
@@ -2284,11 +2266,24 @@ int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec)
host_spec->blkio_device_write_iops_len);
if (ret != 0) {
ERROR("Failed to merge blkio write iops devices");
- return -1;
+ goto out;
}
}
- return 0;
+ /* devices which will be populated into container */
+ if (merge_conf_populate_device(oci_spec, host_spec)) {
+ ret = -1;
+ goto out;
+ }
+
+ /* device cgroup rules which will be added into container */
+ if (merge_conf_device_cgroup_rule(oci_spec, host_spec)) {
+ ret = -1;
+ goto out;
+ }
+
+out:
+ return ret;
}
static bool mounts_expand(defs_mount ***all_mounts, size_t *all_mounts_len, size_t add_len)
@@ -3493,91 +3488,3 @@ out:
free(mntparent);
return ret;
}
-
-int update_devcies_for_oci_spec(oci_runtime_spec *oci_spec, host_config *hostconfig)
-{
- const oci_runtime_spec *readonly_spec = NULL;
- size_t i;
- int ret;
-
- // Step1: get default oci spec config
- readonly_spec = get_readonly_default_oci_spec(hostconfig->system_container);
-
- // Step2: clear oci_spec devices items
- for (i = 0; i < oci_spec->linux->devices_len; i++) {
- free_defs_device(oci_spec->linux->devices[i]);
- oci_spec->linux->devices[i] = NULL;
- }
- // Step3: if default devices length more than old spec, just realloc memory
- if (readonly_spec->linux->devices_len > oci_spec->linux->devices_len) {
- free(oci_spec->linux->devices);
- oci_spec->linux->devices = util_smart_calloc_s(sizeof(defs_device *), readonly_spec->linux->devices_len);
- if (oci_spec->linux->devices == NULL) {
- oci_spec->linux->devices_len = 0;
- ERROR("Out of memory");
- return -1;
- }
- }
- oci_spec->linux->devices_len = 0;
- // Step4: copy default devices to oci spec
- for (i = 0; i < readonly_spec->linux->devices_len; i++) {
- defs_device *tmp_dev = util_common_calloc_s(sizeof(defs_device));
- if (tmp_dev == NULL) {
- ERROR("Out of memory");
- return -1;
- }
- tmp_dev->type = util_strdup_s(readonly_spec->linux->devices[i]->type);
- tmp_dev->path = util_strdup_s(readonly_spec->linux->devices[i]->path);
- tmp_dev->file_mode = readonly_spec->linux->devices[i]->file_mode;
- tmp_dev->major = readonly_spec->linux->devices[i]->major;
- tmp_dev->minor = readonly_spec->linux->devices[i]->minor;
- tmp_dev->uid = readonly_spec->linux->devices[i]->uid;
- tmp_dev->gid = readonly_spec->linux->devices[i]->gid;
- oci_spec->linux->devices[i] = tmp_dev;
- oci_spec->linux->devices_len += 1;
- }
-
- // Step5: clear oci_spec device cgroup rules
- for (i = 0; i < oci_spec->linux->resources->devices_len; i++) {
- free_defs_device_cgroup(oci_spec->linux->resources->devices[i]);
- oci_spec->linux->resources->devices[i] = NULL;
- }
- // Step6: if default devices lenght more than old spec, just realloc memory
- if (readonly_spec->linux->resources->devices_len > oci_spec->linux->resources->devices_len) {
- free(oci_spec->linux->resources->devices);
- oci_spec->linux->resources->devices = util_smart_calloc_s(sizeof(defs_device_cgroup *),
- readonly_spec->linux->resources->devices_len);
- if (oci_spec->linux->resources->devices == NULL) {
- oci_spec->linux->resources->devices_len = 0;
- ERROR("Out of memory");
- return -1;
- }
- }
- oci_spec->linux->resources->devices_len = 0;
- // Step7: copy default device cgroup rules to oci spec
- for (i = 0; i < readonly_spec->linux->resources->devices_len; i++) {
- defs_device_cgroup *tmp_dev_cg = util_common_calloc_s(sizeof(defs_device_cgroup));
- if (tmp_dev_cg == NULL) {
- ERROR("Out of memory");
- return -1;
- }
- tmp_dev_cg->allow = readonly_spec->linux->resources->devices[i]->allow;
- tmp_dev_cg->major = readonly_spec->linux->resources->devices[i]->major;
- tmp_dev_cg->minor = readonly_spec->linux->resources->devices[i]->minor;
- tmp_dev_cg->type = util_strdup_s(readonly_spec->linux->resources->devices[i]->type);
- tmp_dev_cg->access = util_strdup_s(readonly_spec->linux->resources->devices[i]->access);
- oci_spec->linux->resources->devices[i] = tmp_dev_cg;
- oci_spec->linux->resources->devices_len += 1;
- }
-
- // Step8: do update devices and cgroup device rules at here
- if (hostconfig->privileged) {
- // Step8.1: for priviledged container, we should merge all devices under /dev
- ret = merge_all_devices_and_all_permission(oci_spec);
- } else {
- // Step8.2: for common container, we should merge devices defined by user in hostconfig
- ret = merge_conf_devices(oci_spec, hostconfig);
- }
-
- return ret;
-}
\ No newline at end of file
diff --git a/src/daemon/modules/spec/specs_mount.h b/src/daemon/modules/spec/specs_mount.h
index b742ca35..8a28f0e2 100644
--- a/src/daemon/modules/spec/specs_mount.h
+++ b/src/daemon/modules/spec/specs_mount.h
@@ -41,14 +41,10 @@ int set_mounts_readwrite_option(const oci_runtime_spec *oci_spec);
int merge_all_devices_and_all_permission(oci_runtime_spec *oci_spec);
-int merge_conf_devices(oci_runtime_spec *oci_spec, host_config *host_spec);
-
-int merge_conf_blkio_device(oci_runtime_spec *oci_spec, host_config *host_spec);
+int merge_conf_device(oci_runtime_spec *oci_spec, host_config *host_spec);
int setup_ipc_dirs(host_config *host_spec, container_config_v2_common_config *v2_spec);
-int update_devcies_for_oci_spec(oci_runtime_spec *oci_spec, host_config *hostconfig);
-
#ifdef __cplusplus
}
#endif
diff --git a/test/image/oci/oci_config_merge/CMakeLists.txt b/test/image/oci/oci_config_merge/CMakeLists.txt
index d76de35d..42cd2e78 100644
--- a/test/image/oci/oci_config_merge/CMakeLists.txt
+++ b/test/image/oci/oci_config_merge/CMakeLists.txt
@@ -31,11 +31,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/namespace_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/container_unix_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/parse_volume.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/specs.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/parse_volume.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/specs_mount.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/specs_extend.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/spec/specs_security.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/volume/volume.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/volume/local.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/mocks/selinux_label_mock.cc
--
2.42.0
Reference in New Issue View Git Blame Copy Permalink