diff options
| author | fengweihao <[email protected]> | 2021-06-18 15:24:07 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2021-06-18 15:24:07 +0800 |
| commit | c6bb6f75e0c5b927d19eaa0d3a28e12bb38bc0a9 (patch) | |
| tree | 99007fc32e825fa6904a98c9419a61524a57eba9 | |
| parent | fb16275a891c6fac648ec4682604c3a995877284 (diff) | |
策略验证安装包增加内存限制(60G)v2.2.1-20210618
策略验证默认日志等级修改为FATAl
策略验证修改CI构建安装包名称
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | cmake/Package.cmake | 1 | ||||
| -rw-r--r-- | conf/zlog.conf | 4 | ||||
| -rw-r--r-- | script/service/service_override_memsw_limit.conf | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fff8db..df76594 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,11 +87,11 @@ release_build_release: only: - tags -release_build_release_devel: +release_build_debug: stage: build variables: + BUILD_TYPE: Debug BUILD_TYPE: RelWithDebInfo - ENABLE_DEVEL_SWITCH: "ON" PACKAGE: 1 UPLOAD: 1 SYMBOL_TARGET: verify-policy @@ -99,7 +99,7 @@ release_build_release_devel: PULP3_DIST_NAME: tsg-stable-x86_64.el7 extends: .build_by_travis artifacts: - name: "verify-policy-$CI_COMMIT_REF_NAME-release" + name: "verify-policy-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: diff --git a/cmake/Package.cmake b/cmake/Package.cmake index c36b071..3848a8e 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -31,6 +31,7 @@ install(DIRECTORY ./resource DESTINATION ${CMAKE_INSTALL_PREFIX}/) install(FILES script/service/verify-policy.service DESTINATION /usr/lib/systemd/system/) install(FILES script/tmpfiles/verify_policy.conf DESTINATION /usr/lib/tmpfiles.d/) +install(FILES script/service/service_override_memsw_limit.conf DESTINATION /usr/lib/systemd/system/verify-policy.service.d/) # Must uninstall the debug package before install release package if(CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/conf/zlog.conf b/conf/zlog.conf index e2a66b7..c386d5c 100644 --- a/conf/zlog.conf +++ b/conf/zlog.conf @@ -1,3 +1,5 @@ +# kill -s SIGHUP "pid" + [global] default format = "%d(%c), %V, %F, %U, %m%n" [levels] @@ -6,6 +8,6 @@ INFO=20 FATAL=30 [rules] *.fatal "./logs/error.log.%d(%F)"; -*.debug "./logs/verify_policy.log.%d(%F)" +!*.debug "./logs/verify_policy.log.%d(%F)" !*.info "./logs/verify_policy.log.%d(%F)" diff --git a/script/service/service_override_memsw_limit.conf b/script/service/service_override_memsw_limit.conf new file mode 100644 index 0000000..d8b21bf --- /dev/null +++ b/script/service/service_override_memsw_limit.conf @@ -0,0 +1,4 @@ +[Service] +MemoryLimit=60G +ExecStartPost=/bin/bash -c "echo 60G > /sys/fs/cgroup/memory/system.slice/verify-policy.service/memory.memsw.limit_in_bytes" + |