Skip to content

Commit

Permalink
skip unkown types in flt
Browse files Browse the repository at this point in the history
  • Loading branch information
obdev authored and ob-robot committed Sep 8, 2023
1 parent d4e5040 commit dd9169a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 23 deletions.
23 changes: 6 additions & 17 deletions src/sql/monitor/flt/ob_flt_extra_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,7 @@ int FLTControlInfo::deserialize_field(FullLinkTraceExtraInfoId extra_id, const i
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "this extra info id");
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down Expand Up @@ -267,9 +265,7 @@ int FLTSpanInfo::deserialize_field(FullLinkTraceExtraInfoId extra_id, const int6
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "this extra info id");
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down Expand Up @@ -301,9 +297,7 @@ int FLTDrvSpan::deserialize_field(FullLinkTraceExtraInfoId extra_id, const int64
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "this extra info id");
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down Expand Up @@ -362,9 +356,7 @@ int FLTAppInfo::deserialize_field(FullLinkTraceExtraInfoId extra_id, const int64
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "this extra info id");
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down Expand Up @@ -434,9 +426,7 @@ int FLTQueryInfo::deserialize_field(FullLinkTraceExtraInfoId extra_id, const int
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_USER_ERROR(OB_NOT_SUPPORTED, "this extra info id");
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down Expand Up @@ -472,8 +462,7 @@ int FLTShowTrace::deserialize_field(FullLinkTraceExtraInfoId extra_id, const int
break;
}
default: {
ret = OB_NOT_SUPPORTED;
OB_LOG(WARN,"invalid extra info id", K(extra_id));
// skip
break;
}
}
Expand Down
9 changes: 3 additions & 6 deletions src/sql/monitor/flt/ob_flt_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,12 @@ namespace sql
}
case FLT_TYPE_QUERY_INFO: {
// this extra info is written by server, and driver/proxy cannot send this to server;
ret = OB_NOT_SUPPORTED;
LOG_WARN("invalid extra_type", K(extra_type), K(ret));
// skip
break;
}
case FLT_TYPE_CONTROL_INFO: {
// this extra info is written by server, and driver/proxy cannot send this to server;
ret = OB_NOT_SUPPORTED;
LOG_WARN("invalid extra_type", K(extra_type), K(ret));
// skip
break;
}
case FLT_TYPE_SPAN_INFO: {
Expand Down Expand Up @@ -347,8 +345,7 @@ namespace sql
break;
}
default: {
ret = OB_NOT_SUPPORTED;
LOG_WARN("invalid extra_type", K(extra_type), K(ret));
// skip
break;
}
} // switch ends
Expand Down

0 comments on commit dd9169a

Please sign in to comment.