x/gantt
Code Issues Proposed changes

Merge "Raise rather than generating millions of IPs."

Browse Source
This commit is contained in:
Jenkins
2013-04-02 19:42:48 +00:00
committed by Gerrit Code Review
parent 7486e76962 a85e4c5152
commit ffab4bca21
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/nova-manage
View File

@@ -390,6 +390,14 @@ class FloatingIpCommands(object):
reason = _("/%s should be specified as single address(es) " reason = _("/%s should be specified as single address(es) "
"not in cidr format") % net.prefixlen "not in cidr format") % net.prefixlen
raise exception.InvalidInput(reason=reason) raise exception.InvalidInput(reason=reason)
elif net.size >= 1000000:
# NOTE(dripton): If we generate a million IPs and put them in
# the database, the system will slow to a crawl and/or run
# out of memory and crash. This is clearly a misconfiguration.
reason = _("Too many IP addresses will be generated. Please "
"increase /%s to reduce the number generated."
) % net.prefixlen
raise exception.InvalidInput(reason=reason)
else: else:
return net.iter_hosts() return net.iter_hosts()