From c76aa5e651e4bbb782b85d67f001959e85646289 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 20 Nov 2012 08:07:08 +0100 Subject: [PATCH] Increase max fd limit to support 256 bridges (#873072) --- openvswitch-ovs-ctl-ulimit.patch | 11 +++++++++++ openvswitch.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 openvswitch-ovs-ctl-ulimit.patch diff --git a/openvswitch-ovs-ctl-ulimit.patch b/openvswitch-ovs-ctl-ulimit.patch new file mode 100644 index 0000000..a4d8966 --- /dev/null +++ b/openvswitch-ovs-ctl-ulimit.patch @@ -0,0 +1,11 @@ +--- openvswitch-1.7.1.orig/utilities/ovs-ctl.in 2012-11-20 13:36:38.782614801 +0800 ++++ openvswitch-1.7.1.orig/utilities/ovs-ctl.in 2012-11-20 13:37:20.466628024 +0800 +@@ -212,7 +212,7 @@ start () { + # Increase the limit on the number of open file descriptors. + # ovs-vswitchd needs 16 per datapath, plus a few extra, so this + # should allow for 256 (or more) bridges. +- ulimit -n 5000 ++ ulimit -n 6000 + + # Start ovs-vswitchd. + set ovs-vswitchd unix:"$DB_SOCK" diff --git a/openvswitch.spec b/openvswitch.spec index bf1ff79..8fc12d3 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -1,6 +1,6 @@ Name: openvswitch Version: 1.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Open vSwitch daemon/database/utilities # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the @@ -21,6 +21,7 @@ Source7: openvswitch-configure-ovskmod-var.patch # Source7 is not applied, it's used to generate patch0 Patch0: openvswitch-configure-ovskmod-var-autoconfd.patch Patch1: openvswitch-ovs-pki-perm.patch +Patch2: openvswitch-ovs-ctl-ulimit.patch BuildRequires: systemd-units openssl openssl-devel BuildRequires: python python-twisted-core python-twisted-conch python-zope-interface PyQt4 @@ -85,6 +86,7 @@ causing them to function as L2 MAC-learning switches or hub. %setup -q %patch0 -p1 -b .ovskmod %patch1 -p1 -b .openvswitch-ovs-pki-perm +%patch2 -p1 -b .openvswitch-ovs-ctl-ulimit %build %configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki OVSKMOD=openvswitch @@ -205,6 +207,9 @@ desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE6} %changelog +* Tue Nov 20 2012 Thomas Graf - 1.7.1-6 +- Increase max fd limit to support 256 bridges (#873072) + * Tue Nov 1 2012 Thomas Graf - 1.7.1-5 - Don't create world writable pki/*/incomming directory (#845351)