Change MemoryMax constraint in asan envrionment 00/317300/3 accepted/tizen_unified accepted/tizen_unified_x accepted/tizen_unified_x_asan tizen accepted/tizen/unified/20250107.102102 accepted/tizen/unified/x/20250107.210543 accepted/tizen/unified/x/asan/20250113.002022
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Mon, 30 Dec 2024 05:55:15 +0000 (14:55 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Mon, 30 Dec 2024 06:16:15 +0000 (15:16 +0900)
In asan environment, it uses more memory for asan check and
MemoryMax=30M is not enough. To avoid oom-kill of contextd in
asan envrionment, change MemoryMax in asan envrionment
with different asan conf file in contextd.service.d directory.

Change-Id: Ifb854cecfeeb4e7550511ce0c8eb1246e74beaa8
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
packaging/context-service.spec
packaging/contextd.asan.conf [new file with mode: 0644]

index 1d44fa7f1add396ff868db4b3c731cd36c58fc4e..5e449a8126f6841c4498d5610857d1bbf4025cff 100644 (file)
@@ -9,6 +9,7 @@ Source1:        contextd.service
 Source2:       org.tizen.context.conf
 Source3:       contextd-agent.service
 Source4:       contextd-agent.socket
+Source5:       contextd.asan.conf
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(libsystemd)
@@ -67,6 +68,11 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir_user}
 install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir_user}
 ln -s ../contextd-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contextd-agent.socket
 
+%if "%{asan}" == "1"
+mkdir -p %{buildroot}%{_unitdir}/contextd.service.d
+install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/contextd.service.d
+%endif
+
 %files
 %manifest packaging/%{name}.manifest
 %config %{_sysconfdir}/dbus-1/system.d/*
@@ -74,6 +80,9 @@ ln -s ../contextd-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants
 %{_unitdir}/contextd.service
 %{_unitdir}/*/contextd.service
 %license LICENSE
+%if "%{asan}" == "1"
+%{_unitdir}/contextd.service.d/contextd.asan.conf
+%endif
 
 %files -n context-agent
 %manifest packaging/%{name}.manifest
diff --git a/packaging/contextd.asan.conf b/packaging/contextd.asan.conf
new file mode 100644 (file)
index 0000000..af1713a
--- /dev/null
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=64M