server: Add connection rate limiter for server. (#1977)

master
Harshavardhana 9 years ago committed by Anand Babu (AB) Periasamy
parent 57146fbbb8
commit 936a916e78
  1. 5
      globals.go
  2. 63
      rate-limit-handler.go
  3. 2
      routers.go
  4. 8
      server-main.go

@ -39,6 +39,11 @@ var (
globalQuiet = false // Quiet flag set via command line globalQuiet = false // Quiet flag set via command line
globalTrace = false // Trace flag set via environment setting. globalTrace = false // Trace flag set via environment setting.
// Add new global flags here. // Add new global flags here.
// Maximum connections handled per
// server, defaults to 0 (unlimited).
globalMaxConn = 0
// Add new variable global values here.
) )
// global colors. // global colors.

@ -0,0 +1,63 @@
/*
* Minio Cloud Storage, (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package main
import (
"net/http"
"sync"
)
// rateLimit - represents datatype of the functionality implemented to
// limit the number of concurrent http requests.
type rateLimit struct {
handler http.Handler
rqueue chan struct{}
releaseOnce sync.Once
}
// acquire and release implement a way to send and receive from the
// channel this is in-turn used to rate limit incoming connections in
// ServeHTTP() http.Handler method.
func (c *rateLimit) acquire() { c.rqueue <- struct{}{} }
func (c *rateLimit) release() { <-c.rqueue }
// ServeHTTP is an http.Handler ServeHTTP method, implemented to rate
// limit incoming HTTP requests.
func (c *rateLimit) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Acquire the connection if queue is not full, otherwise
// code path waits here until the previous case is true.
c.acquire()
// Serves the request.
c.handler.ServeHTTP(w, r)
// Release by draining the channel once.
c.releaseOnce.Do(c.release)
}
// setRateLimitHandler limits the number of concurrent http requests based on MINIO_MAXCONN.
func setRateLimitHandler(handler http.Handler) http.Handler {
if globalMaxConn == 0 {
return handler
} // else proceed to rate limiting.
// For max connection limit of > '0' we initialize rate limit handler.
return &rateLimit{
handler: handler,
rqueue: make(chan struct{}, globalMaxConn),
}
}

@ -70,6 +70,8 @@ func configureServerHandler(srvCmdConfig serverCmdConfig) http.Handler {
// List of some generic handlers which are applied for all // List of some generic handlers which are applied for all
// incoming requests. // incoming requests.
var handlerFns = []HandlerFunc{ var handlerFns = []HandlerFunc{
// Limits the number of concurrent http requests.
setRateLimitHandler,
// Redirect some pre-defined browser request paths to a static // Redirect some pre-defined browser request paths to a static
// location prefix. // location prefix.
setBrowserRedirectHandler, setBrowserRedirectHandler,

@ -133,6 +133,14 @@ func initServerConfig(c *cli.Context) {
err := serverConfig.Save() err := serverConfig.Save()
fatalIf(err, "Unable to save config.") fatalIf(err, "Unable to save config.")
// Fetch max conn limit from environment variable.
if maxConnStr := os.Getenv("MINIO_MAXCONN"); maxConnStr != "" {
// We need to parse to its integer value.
var err error
globalMaxConn, err = strconv.Atoi(maxConnStr)
fatalIf(err, "Unable to convert MINIO_MAXCONN=%s environment variable into its integer value.", maxConnStr)
}
// Fetch access keys from environment variables if any and update the config. // Fetch access keys from environment variables if any and update the config.
accessKey := os.Getenv("MINIO_ACCESS_KEY") accessKey := os.Getenv("MINIO_ACCESS_KEY")
secretKey := os.Getenv("MINIO_SECRET_KEY") secretKey := os.Getenv("MINIO_SECRET_KEY")

Loading…
Cancel
Save