Skip to content

Commit d18b3cc

Browse files
newsql: Close admin conn on RESET
Signed-off-by: Akshat Sikarwar <[email protected]>
1 parent 6d197e1 commit d18b3cc

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

net/net_evbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2924,7 +2924,7 @@ static int should_reject_request(uint8_t first_byte)
29242924
{
29252925
if (db_is_exiting() || gbl_exit || !gbl_ready) return 1;
29262926
int is_admin = 0;
2927-
if (first_byte == '@') is_admin = 1;/* admin */
2927+
if (first_byte == '@') is_admin = 1;
29282928
return check_appsock_limit(pending_connections, is_admin);
29292929
}
29302930

plugins/newsql/newsql_evbuffer.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,8 +895,12 @@ static void process_newsql_payload(struct newsql_appdata_evbuffer *appdata, CDB2
895895
process_cdb2query(appdata, query);
896896
break;
897897
case CDB2_REQUEST_TYPE__RESET:
898-
newsql_reset_evbuffer(appdata);
899-
evtimer_once(appdata->base, rd_hdr, appdata);
898+
if (clnt->admin) {
899+
newsql_cleanup(appdata);
900+
} else {
901+
newsql_reset_evbuffer(appdata);
902+
evtimer_once(appdata->base, rd_hdr, appdata);
903+
}
900904
break;
901905
case CDB2_REQUEST_TYPE__SSLCONN:
902906
process_ssl_request(appdata);

0 commit comments

Comments
 (0)