Updates to include higher resource limits.

The default limits may affect deamon use in production environment.
Fix introduce higer limit for max. number of processes (threads) 1024 -> 20480
and higher limit for max. opened file descriptors 1024 -> 30720.

Change-Id: I8b11e7f8bbd498fd9572e4f746c27e1d804a066e
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

diff --git a/packaging/rpm/opendaylight-controller.limits b/packaging/rpm/opendaylight-controller.limits
new file mode 100644 (file)
index 0000000..6068b31
--- /dev/null
+++ b/packaging/rpm/opendaylight-controller.limits
@@ -0,0 +1,2 @@
+opendaylight - nofile 30720
+opendaylight - nproc 20480

diff --git a/packaging/rpm/opendaylight-controller.spec b/packaging/rpm/opendaylight-controller.spec
index 6ea6f54fb5217f2f5e4f7216b155ae91fe213802..e52049ddbc38484237b48c7e4c714059f834220d 100644 (file)
--- a/packaging/rpm/opendaylight-controller.spec
+++ b/packaging/rpm/opendaylight-controller.spec
@@ -3,7 +3,7 @@
 
 Name: opendaylight-controller
 Version: 0.1.0
-Release: 0.11.0%{?dist}
+Release: 0.12.0%{?dist}
 Summary: OpenDaylight SDN Controller
 Group: Applications/Communications
 License: EPL
@@ -142,6 +142,7 @@ ln -s %{resources_dir}/plugins %{buildroot}%{data_dir}
 install -m 644 -D %{pkgdir}/%{name}.systemd %{buildroot}%{_unitdir}/%{name}.service
 %else
 install -m 644 -D %{pkgdir}/%{name}.sysv %{buildroot}%{_initddir}/%{name}
+install -m 644 -D %{pkgdir}/%{name}.limits %{buildroot}%{_sysconfdir}/security/limits.d/%{name}
 %endif
 install -m 644 -D %{pkgdir}/%{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
@@ -259,6 +260,7 @@ fi
 %{_unitdir}/%{name}.service
 %else
 %{_initddir}/%{name}
+%{_sysconfdir}/security/limits.d/%{name}
 %endif
 
 # Configuration files should marked as such, so that they aren't overwritten
@@ -279,6 +281,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 09 2014 Miroslav Miklus <mmiklus@cisco.com> - 0.1.0-0.12.0
+- Updates to include higher resource limits.
+
 * Sat Feb 08 2014 Sam Hague <shague@redhat.com> - 0.1.0-0.11.0
 - Remove yangtools artifacts.
 

diff --git a/packaging/rpm/opendaylight-controller.systemd b/packaging/rpm/opendaylight-controller.systemd
index 7120164ff4ce55c2e9aebc13beab77b506dd89d5..57863694bc07e447182008cd15a99d07201f745a 100644 (file)
--- a/packaging/rpm/opendaylight-controller.systemd
+++ b/packaging/rpm/opendaylight-controller.systemd
@@ -9,6 +9,8 @@ User=opendaylight
 Group=opendaylight
 EnvironmentFile=-/etc/sysconfig/opendaylight-controller
 WorkingDirectory=/var/lib/opendaylight-controller
+LimitNOFILE=30720
+LimitNPROC=20480
 ExecStart=-/usr/share/opendaylight-controller/run.odl.sh $ODL_DIST $ODL_OPTS -start
 ExecStop=-/usr/share/opendaylight-controller/run.odl.sh -stop