pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UPDATE WRAPPER support NULL connection_params

connection_manager
YuQing 2020-09-19 17:18:29 +08:00
parent 19b863aceb
commit 56ddf58a6f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/idempotency/client/rpc_wrapper.h
View File

@ -10,6 +10,7 @@
IdempotencyClientChannel *old_channel; \ IdempotencyClientChannel *old_channel; \
int result; \ int result; \
int i; \ int i; \
bool idempotency_enabled; \
uint64_t req_id; \ uint64_t req_id; \
SFNetRetryIntervalContext net_retry_ctx; \ SFNetRetryIntervalContext net_retry_ctx; \
\ \
@ -20,23 +21,26 @@
} \ } \
connection_params = client_ctx->conn_manager. \ connection_params = client_ctx->conn_manager. \
get_connection_params(client_ctx, conn); \ get_connection_params(client_ctx, conn); \
idempotency_enabled = client_ctx->idempotency_enabled && \
connection_params != NULL; \
\ \
sf_init_net_retry_interval_context(&net_retry_ctx, \ sf_init_net_retry_interval_context(&net_retry_ctx, \
&client_ctx->net_retry_cfg.interval_mm, \ &client_ctx->net_retry_cfg.interval_mm, \
&client_ctx->net_retry_cfg.network); \ &client_ctx->net_retry_cfg.network); \
\ \
while (1) { \ while (1) { \
if (client_ctx->idempotency_enabled) { \ if (idempotency_enabled) { \
req_id = idempotency_client_channel_next_seq_id( \ req_id = idempotency_client_channel_next_seq_id( \
connection_params->channel); \ connection_params->channel); \
} else { \ } else { \
req_id = 0; \ req_id = 0; \
} \ } \
\ \
old_channel = connection_params->channel; \ old_channel = connection_params != NULL ? \
connection_params->channel : NULL; \
i = 0; \ i = 0; \
while (1) { \ while (1) { \
if (client_ctx->idempotency_enabled) { \ if (idempotency_enabled) { \
result = idempotency_client_channel_check_wait( \ result = idempotency_client_channel_check_wait( \
connection_params->channel); \ connection_params->channel); \
} else { \ } else { \
@ -52,7 +56,7 @@
} \ } \
\ \
if (result == SF_RETRIABLE_ERROR_CHANNEL_INVALID && \ if (result == SF_RETRIABLE_ERROR_CHANNEL_INVALID && \
client_ctx->idempotency_enabled) \ idempotency_enabled) \
{ \ { \
idempotency_client_channel_check_reconnect( \ idempotency_client_channel_check_reconnect( \
connection_params->channel); \ connection_params->channel); \
@ -74,17 +78,21 @@
\ \
connection_params = client_ctx->conn_manager. \ connection_params = client_ctx->conn_manager. \
get_connection_params(client_ctx, conn); \ get_connection_params(client_ctx, conn); \
if (connection_params->channel != old_channel) { \ if (connection_params != NULL && connection_params->channel != \
old_channel) \
{ \
break; \ break; \
} \ } \
} \ } \
\ \
if (connection_params->channel != old_channel) { /* master changed */ \ if (connection_params != NULL && connection_params->channel != \
old_channel) \
{ /* master changed */ \
sf_reset_net_retry_interval(&net_retry_ctx); \ sf_reset_net_retry_interval(&net_retry_ctx); \
continue; \ continue; \
} \ } \
\ \
if (client_ctx->idempotency_enabled) { \ if (idempotency_enabled) { \
idempotency_client_channel_push( \ idempotency_client_channel_push( \
connection_params->channel, req_id); \ connection_params->channel, req_id); \
} \ } \