This repository has been archived by the owner on Jun 23, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 59
feat: support read throttling by size #938
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
// 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. | ||
|
||
#pragma once | ||
|
||
#include <stdint.h> | ||
#include <string> | ||
#include <dsn/utility/TokenBucket.h> | ||
#include <dsn/dist/fmt_logging.h> | ||
#include <dsn/utility/strings.h> | ||
#include <dsn/utility/string_conv.h> | ||
#include <dsn/c/api_layer1.h> | ||
#include <dsn/perf_counter/perf_counter_wrapper.h> | ||
|
||
namespace dsn { | ||
namespace utils { | ||
|
||
using DynamicTokenBucket = folly::BasicDynamicTokenBucket<std::chrono::steady_clock>; | ||
|
||
// token_bucket_throttling_controller ignores `delay` parameter | ||
class token_bucket_throttling_controller | ||
{ | ||
private: | ||
friend class token_bucket_throttling_controller_test; | ||
|
||
std::unique_ptr<DynamicTokenBucket> _token_bucket; | ||
|
||
bool _enabled; | ||
std::string _env_value; | ||
int32_t _partition_count = 0; | ||
double _rate; | ||
double _burstsize; | ||
|
||
bool is_get_perfcounter = false; | ||
dsn::perf_counter_wrapper *_reject_task_counter; | ||
|
||
public: | ||
token_bucket_throttling_controller(); | ||
|
||
token_bucket_throttling_controller(dsn::perf_counter_wrapper *reject_task_counter); | ||
|
||
bool control(int32_t request_units); | ||
|
||
void only_count(int32_t request_units); | ||
|
||
void reset(bool &changed, std::string &old_env_value); | ||
// return the current env value. | ||
const std::string &env_value() const; | ||
|
||
bool parse_from_env(const std::string &env_value, | ||
int partition_count, | ||
std::string &parse_error, | ||
bool &changed, | ||
std::string &old_env_value); | ||
|
||
static bool string_to_value(std::string str, int64_t &value); | ||
|
||
static bool validate(const std::string &env, std::string &hint_message); | ||
|
||
static bool transform_env_string(const std::string &env, | ||
int64_t &reject_size_value, | ||
bool &enabled, | ||
std::string &hint_message); | ||
}; | ||
|
||
} // namespace utils | ||
} // namespace dsn |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
169 changes: 169 additions & 0 deletions
169
src/utils/test/token_bucket_throttling_controller_test.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,169 @@ | ||
// 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. | ||
|
||
#include <dsn/utils/token_bucket_throttling_controller.h> | ||
#include <dsn/utility/TokenBucket.h> | ||
|
||
#include <gtest/gtest.h> | ||
|
||
namespace dsn { | ||
namespace utils { | ||
|
||
class token_bucket_throttling_controller_test : public ::testing::Test | ||
{ | ||
public: | ||
void test_parse_env_basic_token_bucket_throttling() | ||
{ | ||
token_bucket_throttling_controller cntl; | ||
std::string parse_err; | ||
bool env_changed = false; | ||
std::string old_value; | ||
|
||
int partition_count = 4; | ||
std::string old_env = ""; | ||
std::string env = "20000*delay*100"; | ||
// token_bucket_throttling_controller doesn't support delay only | ||
ASSERT_TRUE(cntl.parse_from_env(env, partition_count, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(cntl._env_value, env); | ||
ASSERT_EQ(cntl._partition_count, 4); | ||
ASSERT_EQ(cntl._burstsize, 0); | ||
ASSERT_EQ(cntl._rate, 0); | ||
ASSERT_EQ(cntl._enabled, false); | ||
ASSERT_EQ(env_changed, true); | ||
ASSERT_EQ(old_value, old_env); | ||
ASSERT_EQ(parse_err, ""); | ||
|
||
old_env = env; | ||
env = "200K"; | ||
ASSERT_TRUE(cntl.parse_from_env(env, partition_count, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(cntl._enabled, true); | ||
ASSERT_EQ(cntl._env_value, env); | ||
ASSERT_EQ(cntl._partition_count, 4); | ||
ASSERT_EQ(cntl._rate, 200000 / partition_count); | ||
ASSERT_EQ(cntl._burstsize, 200000 / partition_count); | ||
ASSERT_EQ(env_changed, true); | ||
ASSERT_EQ(old_value, old_env); | ||
ASSERT_EQ(parse_err, ""); | ||
|
||
old_env = env; | ||
env = "20000*delay*100,20000*reject*100"; | ||
ASSERT_TRUE(cntl.parse_from_env(env, partition_count, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(cntl._enabled, true); | ||
ASSERT_EQ(cntl._env_value, env); | ||
ASSERT_EQ(cntl._partition_count, 4); | ||
ASSERT_EQ(cntl._rate, 20000 / partition_count); | ||
ASSERT_EQ(cntl._burstsize, 20000 / partition_count); | ||
ASSERT_EQ(env_changed, true); | ||
ASSERT_EQ(old_value, old_env); | ||
ASSERT_EQ(parse_err, ""); | ||
|
||
old_env = env; | ||
env = "20000*reject*100"; | ||
ASSERT_TRUE(cntl.parse_from_env(env, partition_count, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(cntl._enabled, true); | ||
ASSERT_EQ(cntl._env_value, env); | ||
ASSERT_EQ(cntl._partition_count, 4); | ||
ASSERT_EQ(cntl._rate, 20000 / partition_count); | ||
ASSERT_EQ(cntl._burstsize, 20000 / partition_count); | ||
ASSERT_EQ(env_changed, true); | ||
ASSERT_EQ(old_value, old_env); | ||
ASSERT_EQ(parse_err, ""); | ||
|
||
// invalid argument | ||
old_env = env; | ||
env = "*deldday*100"; | ||
ASSERT_FALSE(cntl.parse_from_env(env, partition_count, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(env_changed, false); | ||
ASSERT_EQ(parse_err, "wrong format, you can set like 20000 or 20K"); | ||
ASSERT_EQ(cntl._enabled, true); // ensure invalid env won't stop throttling | ||
ASSERT_EQ(old_value, old_env); | ||
|
||
ASSERT_FALSE(cntl.parse_from_env("", 4, parse_err, env_changed, old_value)); | ||
ASSERT_EQ(env_changed, false); | ||
ASSERT_NE(parse_err, ""); | ||
ASSERT_EQ(parse_err, "wrong format, you can set like 20000 or 20K"); | ||
ASSERT_EQ(cntl._enabled, true); | ||
ASSERT_EQ(old_value, old_env); | ||
} | ||
|
||
void throttle_test() | ||
{ | ||
auto cntl = std::make_unique<token_bucket_throttling_controller>(); | ||
std::string parse_err; | ||
bool env_changed = false; | ||
std::string old_value; | ||
const int partition_count = 4; | ||
|
||
int throttle_limit = 200000; | ||
cntl->parse_from_env( | ||
std::to_string(throttle_limit), partition_count, parse_err, env_changed, old_value); | ||
|
||
auto token_bucket = std::make_unique<DynamicTokenBucket>(); | ||
int fail_count = 0; | ||
for (int i = 0; i < 100000; i++) { | ||
token_bucket->consumeWithBorrowAndWait( | ||
1, throttle_limit / partition_count * 0.8, throttle_limit / partition_count * 1.0); | ||
if (!cntl->control(1)) { | ||
fail_count++; | ||
} | ||
} | ||
ASSERT_EQ(fail_count, 0); | ||
|
||
sleep(1); | ||
|
||
fail_count = 0; | ||
for (int i = 0; i < 100000; i++) { | ||
token_bucket->consumeWithBorrowAndWait( | ||
1, throttle_limit / partition_count * 1.2, throttle_limit / partition_count * 1.5); | ||
if (!cntl->control(1)) { | ||
fail_count++; | ||
} | ||
} | ||
ASSERT_GT(fail_count, 10000); | ||
|
||
sleep(1); | ||
|
||
fail_count = 0; | ||
int fail_count1 = 0; | ||
for (int i = 0; i < 200000; i++) { | ||
if (i < 100000) { | ||
token_bucket->consumeWithBorrowAndWait(1, | ||
throttle_limit / partition_count * 1.2, | ||
throttle_limit / partition_count * 1.5); | ||
fail_count1 = fail_count; | ||
} else { | ||
token_bucket->consumeWithBorrowAndWait(1, | ||
throttle_limit / partition_count * 0.2, | ||
throttle_limit / partition_count * 0.3); | ||
} | ||
if (!cntl->control(1)) { | ||
fail_count++; | ||
} | ||
} | ||
ASSERT_GT(fail_count1, 10000); | ||
ASSERT_LE(fail_count, fail_count1 * 1.2); | ||
} | ||
}; | ||
|
||
TEST_F(token_bucket_throttling_controller_test, test_parse_env_basic_token_bucket_throttling) | ||
{ | ||
test_parse_env_basic_token_bucket_throttling(); | ||
} | ||
|
||
TEST_F(token_bucket_throttling_controller_test, throttle_test) { throttle_test(); } | ||
} // namespace utils | ||
} // namespace dsn |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can add some unit tests for rpc_holder