Merge pull request #612 from go-graphite/emohamadi/throughput-quota-p…

…er-min

Make throughput quota config per minute

carbon/app.go

@@ -554,7 +554,7 @@ func (app *App) Start() (err error) {
 				return logicalSize, physicalSize, dataPoints
 			})
 
-			carbonserver.SetQuotas(app.Config.getCarbonserverQuotas())
+			carbonserver.SetQuotas(app.Config.getCarbonserverQuotas(conf.Carbonserver.QuotaUsageReportFrequency.Value()))
 			core.SetThrottle(carbonserver.ShouldThrottleMetric)
 		}
 

carbon/config.go

@@ -11,11 +11,12 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
+	"github.com/lomik/zapwriter"
+
 	"github.com/go-graphite/go-carbon/carbonserver"
 	"github.com/go-graphite/go-carbon/persister"
 	"github.com/go-graphite/go-carbon/receiver/tcp"
 	"github.com/go-graphite/go-carbon/receiver/udp"
-	"github.com/lomik/zapwriter"
 )
 
 const MetricEndpointLocal = "local"
@@ -425,7 +426,8 @@ retentions = 60:43200,3600:43800`), 0600)
 	return configFile
 }
 
-func (c *Config) getCarbonserverQuotas() (quotas []*carbonserver.Quota) {
+func (c *Config) getCarbonserverQuotas(reportFrequency time.Duration) (quotas []*carbonserver.Quota) {
+	minutes := int64(reportFrequency / time.Minute)
 	for _, q := range c.Whisper.Quotas {
 		quotas = append(quotas, &carbonserver.Quota{
 			Pattern:          q.Pattern,
@@ -434,7 +436,7 @@ func (c *Config) getCarbonserverQuotas() (quotas []*carbonserver.Quota) {
 			DataPoints:       q.DataPoints,
 			LogicalSize:      q.LogicalSize,
 			PhysicalSize:     q.PhysicalSize,
-			Throughput:       q.Throughput,
+			Throughput:       q.Throughput * minutes,
 			DroppingPolicy:   carbonserver.ParseQuotaDroppingPolicy(q.DroppingPolicy),
 			StatMetricPrefix: q.StatMetricPrefix,
 		})

doc/quotas.md

@@ -17,7 +17,7 @@ Limitations/Caveats:
 * logical-size: how many logical disk space are allowed for the matched prefix/namespaces
 * physical-size: how many physical disk space are allowed for the matched prefix/namespaces
 * data-points: how many data points (inferred using storage-schemas.conf) are allowed for the matched prefix/namespaces
-* throughput: how many data points are allowed within the interval specified by `carbonserver.quota-usage-report-frequency` for the matched prefix/namespaces
+* throughput: how many data points are allowed within a minute interval for the matched prefix/namespaces
 * dropping-policy: available values includes `none` and `new`. `none` means doesn't not drop any values. `new` means dropping new metrics. `none` can be used to produce only the quota, usage, and throttle metrics without actually dropping the data.
 
 ### Why `logical-size` and `physical-size`
@@ -32,13 +32,13 @@ Usually, `data_points` corresponds to `logical-size` as they are both determined
 
 ### `throughput`
 
-Throughput controls how many data points are allowed within the interval specified by `carbonserver.quota-usage-report-frequency`.
+Throughput controls how many data points are allowed within a minute interval.
 
-This is useful for us to monitor how many datapoints are sent to a specific patthen/namespace. It's useful for cases like some of those namespaces are generating too many datapoints and causing other namespaces to be overflown in the memory cache.
+This is useful for us to monitor how many datapoints are sent to a specific pattern/namespace. It's useful for cases like some of those namespaces are generating too many datapoints and causing other namespaces to be overflown in the memory cache.
 
 The value is reset every interval specified by `carbonserver.quota-usage-report-frequency`.
 
-If `carbonserver.quota-usage-report-frequency` is 1 minute, then `throughput = 600,000`, then it means only 600k data points per minute are allowed to be pushed to the matched namespace/pattern.
+If `carbonserver.quota-usage-report-frequency` is 5 minute, then `throughput = 600,000`, then it means only 3M data points per every 5 minute are allowed to be pushed to the matched namespace/pattern.
 
 For `throughput` control, both new and old metrics might be dropped, depending their arriving order.