x/gantt
Code Issues Proposed changes

Sane rest API rate limit defaults

Browse Source 
The previous rate limit defaults were unusable in any deployment.
Rate limiting to 10 POSTS per minute and 50 servers per day seems
to low, especially when we can use quotas to actually limit the amount
of resources a user can consume.

Update docstring to explain what the rate limiting is used for.

Fixes bug 1178529

DocImpact changed default values

Change-Id: I8cc93423f76d9b0a5135adf69babc4ff355a0951
This commit is contained in:
Joe Gordon
2013-06-27 10:49:50 -07:00
parent df08f4b1c5
commit 9a1ba57ae9
6 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
doc/api_samples/limit-get-resp.json
View File

@@ -18,23 +18,23 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "POST" "verb": "POST"
}, },
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "PUT" "verb": "PUT"
}, },
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 100, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 100, "value": 120,
"verb": "DELETE" "verb": "DELETE"
} }
], ],
@@ -45,9 +45,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 50, "remaining": 120,
"unit": "DAY", "unit": "MINUTE",
"value": 50, "value": 120,
"verb": "POST" "verb": "POST"
} }
], ],
@@ -58,9 +58,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 3, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 3, "value": 120,
"verb": "GET" "verb": "GET"
} }
], ],
@@ -72,7 +72,7 @@
{ {
"next-available": "2012-11-27T17:22:18Z", "next-available": "2012-11-27T17:22:18Z",
"remaining": 12, "remaining": 12,
"unit": "HOUR", "unit": "MINUTE",
"value": 12, "value": 12,
"verb": "GET" "verb": "GET"
} }
@@ -82,4 +82,4 @@
} }
] ]
} }
} }

14
doc/api_samples/limit-get-resp.xml
View File

@@ -2,18 +2,18 @@
<limits xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0"> <limits xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
<rates> <rates>
<rate regex=".*" uri="*"> <rate regex=".*" uri="*">
<limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="10" value="10"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="PUT" remaining="10" value="10"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="DELETE" remaining="100" value="100"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/servers" uri="*/servers"> <rate regex="^/servers" uri="*/servers">
<limit next-available="2012-11-27T17:22:18Z" unit="DAY" verb="POST" remaining="50" value="50"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
</rate> </rate>
<rate regex=".*changes-since.*" uri="*changes-since*"> <rate regex=".*changes-since.*" uri="*changes-since*">
<limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="3" value="3"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/os-fping" uri="*/os-fping"> <rate regex="^/os-fping" uri="*/os-fping">
<limit next-available="2012-11-27T17:22:18Z" unit="HOUR" verb="GET" remaining="12" value="12"/> <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
</rate> </rate>
</rates> </rates>
<absolute> <absolute>
@@ -29,4 +29,4 @@
<limit name="maxTotalInstances" value="10"/> <limit name="maxTotalInstances" value="10"/>
<limit name="maxTotalRAMSize" value="51200"/> <limit name="maxTotalRAMSize" value="51200"/>
</absolute> </absolute>
</limits> </limits>

26
doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json
View File

@@ -23,23 +23,23 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "POST" "verb": "POST"
}, },
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "PUT" "verb": "PUT"
}, },
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 100, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 100, "value": 120,
"verb": "DELETE" "verb": "DELETE"
} }
], ],
@@ -50,9 +50,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 50, "remaining": 120,
"unit": "DAY", "unit": "MINUTE",
"value": 50, "value": 120,
"verb": "POST" "verb": "POST"
} }
], ],
@@ -63,9 +63,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 3, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 3, "value": 120,
"verb": "GET" "verb": "GET"
} }
], ],
@@ -77,7 +77,7 @@
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 12, "remaining": 12,
"unit": "HOUR", "unit": "MINUTE",
"value": 12, "value": 12,
"verb": "GET" "verb": "GET"
} }
@@ -87,4 +87,4 @@
} }
] ]
} }
} }

14
doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml
View File

@@ -2,18 +2,18 @@
<limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0"> <limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
<rates> <rates>
<rate regex=".*" uri="*"> <rate regex=".*" uri="*">
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="10" value="10"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="10" value="10"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="100" value="100"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/servers" uri="*/servers"> <rate regex="^/servers" uri="*/servers">
<limit next-available="2012-11-27T17:24:53Z" unit="DAY" verb="POST" remaining="50" value="50"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
</rate> </rate>
<rate regex=".*changes-since.*" uri="*changes-since*"> <rate regex=".*changes-since.*" uri="*changes-since*">
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="3" value="3"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/os-fping" uri="*/os-fping"> <rate regex="^/os-fping" uri="*/os-fping">
<limit next-available="2012-11-27T17:24:53Z" unit="HOUR" verb="GET" remaining="12" value="12"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
</rate> </rate>
</rates> </rates>
<absolute> <absolute>
@@ -34,4 +34,4 @@
<limit name="totalCoresUsed" value="0"/> <limit name="totalCoresUsed" value="0"/>
<limit name="maxTotalRAMSize" value="51200"/> <limit name="maxTotalRAMSize" value="51200"/>
</absolute> </absolute>
</limits> </limits>

26
doc/api_samples/os-used-limits/usedlimits-get-resp.json
View File

@@ -23,23 +23,23 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "POST" "verb": "POST"
}, },
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 10, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 10, "value": 120,
"verb": "PUT" "verb": "PUT"
}, },
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 100, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 100, "value": 120,
"verb": "DELETE" "verb": "DELETE"
} }
], ],
@@ -50,9 +50,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 50, "remaining": 120,
"unit": "DAY", "unit": "MINUTE",
"value": 50, "value": 120,
"verb": "POST" "verb": "POST"
} }
], ],
@@ -63,9 +63,9 @@
"limit": [ "limit": [
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 3, "remaining": 120,
"unit": "MINUTE", "unit": "MINUTE",
"value": 3, "value": 120,
"verb": "GET" "verb": "GET"
} }
], ],
@@ -77,7 +77,7 @@
{ {
"next-available": "2012-11-27T17:24:52Z", "next-available": "2012-11-27T17:24:52Z",
"remaining": 12, "remaining": 12,
"unit": "HOUR", "unit": "MINUTE",
"value": 12, "value": 12,
"verb": "GET" "verb": "GET"
} }
@@ -87,4 +87,4 @@
} }
] ]
} }
} }

14
doc/api_samples/os-used-limits/usedlimits-get-resp.xml
View File

@@ -2,18 +2,18 @@
<limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0"> <limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
<rates> <rates>
<rate regex=".*" uri="*"> <rate regex=".*" uri="*">
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="10" value="10"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="10" value="10"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="100" value="100"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/servers" uri="*/servers"> <rate regex="^/servers" uri="*/servers">
<limit next-available="2012-11-27T17:24:53Z" unit="DAY" verb="POST" remaining="50" value="50"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
</rate> </rate>
<rate regex=".*changes-since.*" uri="*changes-since*"> <rate regex=".*changes-since.*" uri="*changes-since*">
<limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="3" value="3"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
</rate> </rate>
<rate regex="^/os-fping" uri="*/os-fping"> <rate regex="^/os-fping" uri="*/os-fping">
<limit next-available="2012-11-27T17:24:53Z" unit="HOUR" verb="GET" remaining="12" value="12"/> <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
</rate> </rate>
</rates> </rates>
<absolute> <absolute>
@@ -34,4 +34,4 @@
<limit name="totalCoresUsed" value="0"/> <limit name="totalCoresUsed" value="0"/>
<limit name="maxTotalRAMSize" value="51200"/> <limit name="maxTotalRAMSize" value="51200"/>
</absolute> </absolute>
</limits> </limits>