diff options
| author | 刘畅 <[email protected]> | 2024-04-18 07:33:14 +0000 |
|---|---|---|
| committer | 刘畅 <[email protected]> | 2024-04-18 07:33:14 +0000 |
| commit | c6a8526ad6d118ccd506ccc329aee360da96a5b8 (patch) | |
| tree | de16ea9726a8a53e76ad3acc6dbf0db269f55e94 | |
| parent | 548a3a53fa87659402aca4fbf6de8eb42d8807b6 (diff) | |
| parent | 2a8ba1c6c5ec28e589a3a80f8e7082c52daa615c (diff) | |
Merge branch 'fixbug_fairness_dont_enlarge_request_token' into 'rel'v3.1.29
fair-share类型的profile，获取token时不做放大倍数处理
See merge request tango/shaping-engine!90
| -rw-r--r-- | shaping/src/shaper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shaping/src/shaper.cpp b/shaping/src/shaper.cpp index 66594f0..9000bac 100644 --- a/shaping/src/shaper.cpp +++ b/shaping/src/shaper.cpp @@ -629,7 +629,9 @@ static void shaper_token_get_from_profile(struct shaping_thread_ctx *ctx, struct break; case PROFILE_TYPE_HOST_FARINESS: case PROFILE_TYPE_MAX_MIN_HOST_FAIRNESS: - swarmkv_ftconsume(ctx->swarmkv_db, key, strlen(key), sf->src_ip_str, sf->src_ip_str_len, sf->matched_rule_infos[sf->anchor].fair_factor, req_token_bits * TOKEN_MULTIPLE_DEFAULT, shaper_token_get_cb, arg); + swarmkv_ftconsume(ctx->swarmkv_db, key, strlen(key), sf->src_ip_str, sf->src_ip_str_len, sf->matched_rule_infos[sf->anchor].fair_factor, req_token_bits, shaper_token_get_cb, arg); + //TODO: ftconsume with flexiable + //swarmkv_async_command(ctx->swarmkv_db, shaper_token_get_cb, arg, "FTCONSUME %s %s %d %d %s", key, sf->src_ip_str, sf->matched_rule_infos[sf->anchor].fair_factor, req_token_bits, "FLEXIBLE"); break; case PROFILE_TYPE_SPLIT_BY_LOCAL_HOST: swarmkv_btconsume(ctx->swarmkv_db, key, strlen(key), sf->src_ip_str, sf->src_ip_str_len, req_token_bits * TOKEN_MULTIPLE_DEFAULT, shaper_token_get_cb, arg); |