Skip to content

Commit 758d7d3

Browse files
authored
Merge pull request #5 from polarismesh/hotfix/fix_lb_mode
fix lb_mode enum bug.
2 parents b3470c5 + bf0d4b2 commit 758d7d3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

nginx_polaris_module/ngx_http_upstream_polaris_module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ typedef struct {
7676
ngx_str_t polaris_service_name;
7777
ngx_int_t polaris_timeout;
7878
ngx_str_t polaris_lb_key;
79-
polaris::LoadBalanceType polaris_lb_mode;
79+
ngx_int_t polaris_lb_mode;
8080

8181
ngx_int_t polaris_dynamic_route_enabled;
8282
ngx_str_t polaris_dynamic_route_metadata_list;

nginx_polaris_module/ngx_http_upstream_polaris_wrapper.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,19 +354,19 @@ void set_polaris_lb_mode(ngx_http_upstream_polaris_srv_conf_t* srv, ngx_http_req
354354
ngx_http_upstream_polaris_ctx_t* ctx) {
355355
switch (srv->polaris_lb_mode) {
356356
case POLARIS_DEFAULT:
357-
ctx->polaris_lb_mode = polaris::kLoadBalanceTypeDefaultConfig;
357+
ctx->polaris_lb_mode = 0;
358358
break;
359359
case POLARIS_WEIGHTED_RANDOM:
360-
ctx->polaris_lb_mode = polaris::kLoadBalanceTypeWeightedRandom;
360+
ctx->polaris_lb_mode = 0;
361361
break;
362362
case POLARIS_RING_HASH:
363-
ctx->polaris_lb_mode = polaris::kLoadBalanceTypeRingHash;
363+
ctx->polaris_lb_mode = 1;
364364
break;
365365
case POLARIS_L5_CST_HASH:
366-
ctx->polaris_lb_mode = polaris::kLoadBalanceTypeL5CstHash;
366+
ctx->polaris_lb_mode = 1;
367367
break;
368368
default:
369-
ctx->polaris_lb_mode = polaris::kLoadBalanceTypeDefaultConfig;
369+
ctx->polaris_lb_mode = 0;
370370
}
371371
}
372372

@@ -449,7 +449,9 @@ int polaris_get_addr(ngx_http_upstream_polaris_ctx_t* ctx) {
449449
polaris::Instance instance;
450450
polaris::GetOneInstanceRequest request(serviceKey);
451451
request.SetTimeout(ctx->polaris_timeout);
452-
request.SetLoadBalanceType(ctx->polaris_lb_mode);
452+
if (ctx->polaris_lb_mode > 0) {
453+
request.SetLoadBalanceType(polaris::kLoadBalanceTypeRingHash);
454+
}
453455
set_request_hash_str(ctx, request);
454456

455457
if (ctx->polaris_dynamic_route_enabled) {

0 commit comments

Comments
 (0)