From: Ben Pfaff <blp@nicira.com>
Date: Fri, 27 Jan 2012 00:02:01 +0000 (-0800)
Subject: ovs-ctl: Restore ability to create 256 bridges.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5368f739012f0a94dd99130bf98ce91a9b3a52b3;p=openvswitch

ovs-ctl: Restore ability to create 256 bridges.

OVS is supposed to support at least 256 bridges simultaneously, but the
file descriptor count was a little too low for that.

Build tested only.

Bug #8218.
Reported-by: Luca Giraudo <lgiraudo@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index d1df6a84..9bdb3df1 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -203,9 +203,10 @@ start () {
     if daemon_is_running ovs-vswitchd; then
 	log_success_msg "ovs-vswitchd is already running"
     else
-	# Increase the limit on the number of open file descriptors since
-	# ovs-vswitchd needs a few per bridge
-	ulimit -n 4096
+	# 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
 
 	# Start ovs-vswitchd.
 	set ovs-vswitchd unix:"$DB_SOCK"