Merge pull request #2176 from taosdata/hotfix/td405

Hotfix/td405

src/mnode/src/mnodeProfile.c

@@ -264,13 +264,13 @@ static int32_t mnodeRetrieveConns(SShowObj *pShow, char *data, int32_t rows, voi
 // not thread safe, need optimized
 int32_t mnodeSaveQueryStreamList(SConnObj *pConn, SCMHeartBeatMsg *pHBMsg) {
   pConn->numOfQueries = htonl(pHBMsg->numOfQueries);
-  if (pConn->numOfQueries > 0) {
+  if (pConn->numOfQueries > 0 && pConn->numOfQueries < 20) {
     pConn->pQueries = calloc(sizeof(SQueryDesc), pConn->numOfQueries);
     memcpy(pConn->pQueries, pHBMsg->pData, pConn->numOfQueries * sizeof(SQueryDesc));
   }
 
   pConn->numOfStreams = htonl(pHBMsg->numOfStreams);
-  if (pConn->numOfStreams > 0) {
+  if (pConn->numOfStreams > 0 && pConn->numOfStreams < 20) {
     pConn->pStreams = calloc(sizeof(SStreamDesc), pConn->numOfStreams);
     memcpy(pConn->pStreams, pHBMsg->pData + pConn->numOfQueries * sizeof(SQueryDesc),
            pConn->numOfStreams * sizeof(SStreamDesc));

tests/script/general/http/grafana.sim

@@ -66,7 +66,7 @@ endi
 
 system_content curl 127.0.0.1:6020/grafana/login/xx/xx/
 print 3-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"invalid user"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"mnode invalid user"}@ then
   return -1
 endi
 
@@ -78,7 +78,7 @@ endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:6020/grafana/login/1/root/1/
 print 5-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"invalid user"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"mnode invalid user"}@ then
   return -1
 endi
 

tests/script/general/http/restful_full.sim

@@ -93,7 +93,7 @@ endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 127.0.0.1:6020/rest/sql
 print 13-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"database aleady exist"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"mnode database aleady exist"}@ then
   return -1
 endi
 
@@ -126,7 +126,7 @@ endi
 #18
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:6020/rest/sql
 print 18-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"db not selected"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"mnode db not selected"}@ then
   return -1
 endi
 
@@ -147,7 +147,7 @@ print ===============  step3 - db
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
 print 21-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"invalid table id"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"mnode invalid table id"}@ then
   return -1
 endi