summaryrefslogtreecommitdiffstats
path: root/ipapython/platform/fedora16/service.py
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2013-08-06 17:09:15 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-08-26 13:07:17 +0200
commit6961cf2e77cca8f3784a6d82cebeb0bb8df1f535 (patch)
treef2cde5969b8cdfe45408e5189665ad7d0bf16e64 /ipapython/platform/fedora16/service.py
parent34342b9a972a3a454b979dc64d0a510c5af24894 (diff)
downloadfreeipa-6961cf2e77cca8f3784a6d82cebeb0bb8df1f535.tar.gz
freeipa-6961cf2e77cca8f3784a6d82cebeb0bb8df1f535.tar.xz
freeipa-6961cf2e77cca8f3784a6d82cebeb0bb8df1f535.zip
Perform dirsrv tuning at platform level
When configuring the 389 Directory Server instance, we tune it so that number of file descriptors available to the DS is increased from the default 1024 to 8192. There are platform specific steps that need to be conducted differently on systemd compatible platforms and sysV compatible platforms. systemd: set LimitNOFILE to 8192 in /etc/sysconfig/dirsrv.systemd sysV: set ulimit -n 8192 in /etc/sysconfig/dirsrv set ulimit - nofile 8192 in /etc/security/limits.conf https://fedorahosted.org/freeipa/ticket/3823
Diffstat (limited to 'ipapython/platform/fedora16/service.py')
-rw-r--r--ipapython/platform/fedora16/service.py30
1 files changed, 24 insertions, 6 deletions
diff --git a/ipapython/platform/fedora16/service.py b/ipapython/platform/fedora16/service.py
index bceb87cd5..297e68332 100644
--- a/ipapython/platform/fedora16/service.py
+++ b/ipapython/platform/fedora16/service.py
@@ -21,7 +21,7 @@ import os
import time
from ipapython import ipautil, dogtag
-from ipapython.platform import base, redhat
+from ipapython.platform import base
from ipapython.platform.base import systemd
from ipapython.platform.fedora16 import selinux
from ipapython.ipa_log_manager import root_logger
@@ -78,20 +78,38 @@ class Fedora16Service(systemd.SystemdService):
# If we wouldn't do this, our instances will not be started as systemd would
# not have any clue about instances (PKI-IPA and the domain we serve) at all.
# Thus, hook into dirsrv.restart().
+
+
class Fedora16DirectoryService(Fedora16Service):
- def enable(self, instance_name=""):
- super(Fedora16DirectoryService, self).enable(instance_name)
+
+ def tune_nofile_platform(self, num=8192, fstore=None):
+ """
+ Increase the number of files descriptors available to directory server
+ from the default 1024 to 8192. This will allow to support a greater
+ number of clients out of the box.
+
+ This is a part of the implementation that is systemd-specific.
+
+ Returns False if the setting of the nofile limit needs to be skipped.
+ """
+
dirsrv_systemd = "/etc/sysconfig/dirsrv.systemd"
+
if os.path.exists(dirsrv_systemd):
# We need to enable LimitNOFILE=8192 in the dirsrv@.service
# Since 389-ds-base-1.2.10-0.8.a7 the configuration of the
# service parameters is performed via
# /etc/sysconfig/dirsrv.systemd file which is imported by systemd
# into dirsrv@.service unit
- replacevars = {'LimitNOFILE':'8192'}
- ipautil.inifile_replace_variables(dirsrv_systemd, 'service', replacevars=replacevars)
+ replacevars = {'LimitNOFILE': str(num)}
+ ipautil.inifile_replace_variables(dirsrv_systemd,
+ 'service',
+ replacevars=replacevars)
selinux.restore_context(dirsrv_systemd)
- ipautil.run(["/bin/systemctl", "--system", "daemon-reload"],raiseonerr=False)
+ ipautil.run(["/bin/systemctl", "--system", "daemon-reload"],
+ raiseonerr=False)
+
+ return True
def restart(self, instance_name="", capture_output=True, wait=True):
if len(instance_name) > 0: