Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DBAE9200C41 for ; Fri, 24 Mar 2017 23:21:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DA2C9160B93; Fri, 24 Mar 2017 22:21:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2E104160B75 for ; Fri, 24 Mar 2017 23:21:46 +0100 (CET) Received: (qmail 83981 invoked by uid 500); 24 Mar 2017 22:21:45 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 83968 invoked by uid 99); 24 Mar 2017 22:21:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Mar 2017 22:21:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D86991865E7 for ; Fri, 24 Mar 2017 22:21:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -100.001 X-Spam-Level: X-Spam-Status: No, score=-100.001 tagged_above=-999 required=6.31 tests=[RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Ms-H6020p6uD for ; Fri, 24 Mar 2017 22:21:43 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 0B38D5F297 for ; Fri, 24 Mar 2017 22:21:43 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 1218AE0A2B for ; Fri, 24 Mar 2017 22:21:41 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id A0D9924067 for ; Fri, 24 Mar 2017 22:21:41 +0000 (UTC) Date: Fri, 24 Mar 2017 22:21:41 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: dev@zookeeper.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (ZOOKEEPER-2736) Add a connection rate limiter MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Fri, 24 Mar 2017 22:21:47 -0000 [ https://issues.apache.org/jira/browse/ZOOKEEPER-2736?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15941242#comment-15941242 ] ASF GitHub Bot commented on ZOOKEEPER-2736: ------------------------------------------- Github user eribeiro commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/205#discussion_r108010303 --- Diff: src/java/main/org/apache/zookeeper/common/TokenBucket.java --- @@ -0,0 +1,88 @@ +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.zookeeper.common; + +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * Simple rate limiter based on a token bucket. + */ +public class TokenBucket implements RateLimiter { + + // VisibleForTesting + long refreshPeriodNanos = TimeUnit.SECONDS.toNanos(1L); + // VisibleForTesting + volatile long nextRefillTime; + private AtomicLong tokens; + private long capacity; + private long tokensPerPeriod; + + public TokenBucket() { } + + // VisibleForTesting + public TokenBucket(long capacity, long tokensPerSecond, long initialTokens) { + this.tokens = new AtomicLong(initialTokens); + this.capacity = Math.max(capacity, tokensPerSecond); + this.tokensPerPeriod = tokensPerSecond; + this.nextRefillTime = System.nanoTime() + refreshPeriodNanos; + } + + @Override + public boolean tryAquire() { + refill(); + long current = tokens.get(); + while (current > 0) { + if (tokens.compareAndSet(current, current - 1)) { + return true; + } + current = tokens.get(); + } + return false; + } + + private void refill() { + long currentTime = System.nanoTime(); + if (currentTime >= nextRefillTime) { + synchronized (this) { + if (currentTime >= nextRefillTime) { + long elapsedNanos = currentTime - nextRefillTime + refreshPeriodNanos; + long elapsedPeriods = elapsedNanos / refreshPeriodNanos; + long newTokens = elapsedPeriods * tokensPerPeriod; + tokens.set(Math.min(capacity, tokens.get() + newTokens)); + nextRefillTime = currentTime + refreshPeriodNanos - (elapsedNanos % refreshPeriodNanos); + } + } + } + } + + // VisibleForTesting + long getTokenCount() { --- End diff -- +1. > Add a connection rate limiter > ----------------------------- > > Key: ZOOKEEPER-2736 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2736 > Project: ZooKeeper > Issue Type: Improvement > Components: server > Affects Versions: 3.4.9, 3.5.2 > Reporter: Vincent Poon > Attachments: ZOOKEEPER-2736.v1.patch > > > Currently the maxClientCnxns property only limits the aggregate number of connections from a client, but not the rate at which connections can be created. > This patch adds a configurable connection rate limiter which limits the rate as well. -- This message was sent by Atlassian JIRA (v6.3.15#6346)