hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix the core of sql nio when observer is stopping part 2

Browse Source
This commit is contained in:
496148326@qq.com
2023-05-24 09:41:10 +00:00
committed by ob-robot
parent 9ee5e323e4
commit 5ef87ac073
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
deps/oblib/src/rpc/obmysql/ob_sql_nio.cpp vendored
View File

@ -336,9 +336,10 @@ private:
class ObSqlSock: public ObLink class ObSqlSock: public ObLink
{ {
public: public:
ObSqlSock(ObSqlNioImpl *nio, int fd): nio_impl_(nio), fd_(fd), err_(0), read_buffer_(fd), ObSqlSock(ObSqlNioImpl *nio, int fd): dlink_(), all_list_link_(), write_task_link_(), nio_impl_(nio),
need_epoll_trigger_write_(false), may_handling_(true), handler_close_flag_(false), fd_(fd), err_(0), read_buffer_(fd), need_epoll_trigger_write_(false), may_handling_(true),
need_shutdown_(false), last_decode_time_(0), last_write_time_(0), sql_session_info_(NULL) { handler_close_flag_(false), need_shutdown_(false), last_decode_time_(0), last_write_time_(0),
sql_session_info_(NULL) {
memset(sess_, 0, sizeof(sess_)); memset(sess_, 0, sizeof(sess_));
} }
~ObSqlSock() {} ~ObSqlSock() {}
@ -746,7 +747,9 @@ public:
while (cur != head) { while (cur != head) {
ObSqlSock* s = CONTAINER_OF(cur, ObSqlSock, all_list_link_); ObSqlSock* s = CONTAINER_OF(cur, ObSqlSock, all_list_link_);
cur = cur->next_; cur = cur->next_;
prepare_destroy(s); if (s->set_error(EIO)) {
prepare_destroy(s);
}
} }
while(head->next_ != head) { while(head->next_ != head) {
handle_write_req_queue(); handle_write_req_queue();
@ -839,7 +842,7 @@ private:
} }
if (OB_UNLIKELY(0 != err)) { if (OB_UNLIKELY(0 != err)) {
revert_sock(s); revert_sock(s);
if (s->set_error(err)) { if (s->set_error(EIO)) {
prepare_destroy(s); prepare_destroy(s);
} }
} }