xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix issue #552

This commit is contained in:
slguan 2019-09-24 14:32:12 +08:00
parent 67c646b10d
commit 806a9310e3
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/cfg/taos.cfg
View File

@ -181,7 +181,7 @@
# sdbDebugFlag 135 # sdbDebugFlag 135
# debug flag for RPC # debug flag for RPC
# taosDebugFlag 131 # rpcDebugFlag 131
# debug flag for basic utils # debug flag for basic utils
# debugFlag 131 # debugFlag 131

2
src/client/src/tscSQLParser.c
View File

@ -3856,7 +3856,7 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
} }
SDNodeDynConfOption DNODE_DYNAMIC_CFG_OPTIONS[13] = { SDNodeDynConfOption DNODE_DYNAMIC_CFG_OPTIONS[13] = {
{"resetLog", 8}, {"resetQueryCache", 15}, {"dDebugFlag", 10}, {"taosDebugFlag", 13}, {"resetLog", 8}, {"resetQueryCache", 15}, {"dDebugFlag", 10}, {"rpcDebugFlag", 12},
{"tmrDebugFlag", 12}, {"cDebugFlag", 10}, {"uDebugFlag", 10}, {"mDebugFlag", 10}, {"tmrDebugFlag", 12}, {"cDebugFlag", 10}, {"uDebugFlag", 10}, {"mDebugFlag", 10},
{"sdbDebugFlag", 12}, {"httpDebugFlag", 13}, {"monitorDebugFlag", 16}, {"qDebugflag", 10}, {"sdbDebugFlag", 12}, {"httpDebugFlag", 13}, {"monitorDebugFlag", 16}, {"qDebugflag", 10},
{"debugFlag", 9}}; {"debugFlag", 9}};

2
src/inc/tglobalcfg.h
View File

@ -155,7 +155,7 @@ extern int sdbDebugFlag;
extern int httpDebugFlag; extern int httpDebugFlag;
extern int monitorDebugFlag; extern int monitorDebugFlag;
extern int uDebugFlag; extern int uDebugFlag;
extern int taosDebugFlag; extern int rpcDebugFlag;
extern int debugFlag; extern int debugFlag;
extern int odbcdebugFlag; extern int odbcdebugFlag;
extern int qdebugFlag; extern int qdebugFlag;

16
src/inc/tlog.h
View File

@ -132,23 +132,23 @@ extern int cdebugFlag;
{ tprintf("JNI ", 255, __VA_ARGS__); } { tprintf("JNI ", 255, __VA_ARGS__); }
// rpc log function // rpc log function
extern int taosDebugFlag; extern int rpcDebugFlag;
#define tError(...) \ #define tError(...) \
if (taosDebugFlag & DEBUG_ERROR) { \ if (rpcDebugFlag & DEBUG_ERROR) { \
tprintf("ERROR RPC ", taosDebugFlag, __VA_ARGS__); \ tprintf("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); \
} }
#define tWarn(...) \ #define tWarn(...) \
if (taosDebugFlag & DEBUG_WARN) { \ if (rpcDebugFlag & DEBUG_WARN) { \
tprintf("WARN RPC ", taosDebugFlag, __VA_ARGS__); \ tprintf("WARN RPC ", rpcDebugFlag, __VA_ARGS__); \
} }
#define tTrace(...) \ #define tTrace(...) \
if (taosDebugFlag & DEBUG_TRACE) { \ if (rpcDebugFlag & DEBUG_TRACE) { \
tprintf("RPC ", taosDebugFlag, __VA_ARGS__); \ tprintf("RPC ", rpcDebugFlag, __VA_ARGS__); \
} }
#define tPrint(...) \ #define tPrint(...) \
{ tprintf("RPC ", 255, __VA_ARGS__); } { tprintf("RPC ", 255, __VA_ARGS__); }
#define tDump(x, y) \ #define tDump(x, y) \
if (taosDebugFlag & DEBUG_DUMP) { \ if (rpcDebugFlag & DEBUG_DUMP) { \
taosDumpData((unsigned char *)x, y); \ taosDumpData((unsigned char *)x, y); \
} }

2
src/inc/trpc.h
View File

@ -73,7 +73,7 @@ typedef struct {
char * ckey; // ciphering key char * ckey; // ciphering key
} SRpcConnInit; } SRpcConnInit;
extern int taosDebugFlag; extern int rpcDebugFlag;
extern int tsRpcHeadSize; extern int tsRpcHeadSize;
void *taosOpenRpc(SRpcInit *pRpc); void *taosOpenRpc(SRpcInit *pRpc);

10
src/rpc/src/trpc.c
View File

@ -116,7 +116,7 @@ typedef struct rpc_server {
} STaosRpc; } STaosRpc;
// configurable // configurable
int taosDebugFlag = 131; int rpcDebugFlag = 131;
int tsRpcTimer = 300; int tsRpcTimer = 300;
int tsRpcMaxTime = 600; // seconds; int tsRpcMaxTime = 600; // seconds;
int tsRpcProgressTime = 10; // milliseocnds int tsRpcProgressTime = 10; // milliseocnds
@ -628,14 +628,14 @@ int taosSendDataToPeer(SRpcConn *pConn, char *data, int dataLen) {
if (pConn->signature != pConn || pServer == NULL) return -1; if (pConn->signature != pConn || pServer == NULL) return -1;
if (pHeader->msgType & 1) { if (pHeader->msgType & 1) {
if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (taosDebugFlag & 16)) if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16))
tTrace( tTrace(
"%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, len:%d tranId:%d " "%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, len:%d tranId:%d "
"pConn:%p", "pConn:%p",
pServer->label, pConn->chann, pConn->sid, pConn->meterId, taosMsg[pHeader->msgType], pConn->peerIpstr, pServer->label, pConn->chann, pConn->sid, pConn->meterId, taosMsg[pHeader->msgType], pConn->peerIpstr,
pConn->peerPort, dataLen, pHeader->tranId, pConn); pConn->peerPort, dataLen, pHeader->tranId, pConn);
} else { } else {
if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (taosDebugFlag & 16)) if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16))
tTrace( tTrace(
"%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, code:%u len:%d " "%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, code:%u len:%d "
"tranId:%d pConn:%p", "tranId:%d pConn:%p",
@ -1050,7 +1050,7 @@ void *taosProcessDataFromPeer(char *data, int dataLen, uint32_t ip, short port,
return pConn; return pConn;
} }
if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (taosDebugFlag & 16)) { if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16)) {
tTrace("%s cid:%d sid:%d id:%s, %s received from 0x%x:%hu, parse code:%u, first:%u len:%d tranId:%d pConn:%p", tTrace("%s cid:%d sid:%d id:%s, %s received from 0x%x:%hu, parse code:%u, first:%u len:%d tranId:%d pConn:%p",
pServer->label, chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], ip, port, code, pHeader->content[0], pServer->label, chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], ip, port, code, pHeader->content[0],
dataLen, pHeader->tranId, pConn); dataLen, pHeader->tranId, pConn);
@ -1084,7 +1084,7 @@ void *taosProcessDataFromPeer(char *data, int dataLen, uint32_t ip, short port,
// memcpy(schedMsg.msg, (char *)(&(pHeader->destId)), pHeader->msgLen); // memcpy(schedMsg.msg, (char *)(&(pHeader->destId)), pHeader->msgLen);
} }
if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (taosDebugFlag & 16)) { if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16)) {
tTrace("%s cid:%d sid:%d id:%s, %s is put into queue, msgLen:%d pConn:%p pTimer:%p", tTrace("%s cid:%d sid:%d id:%s, %s is put into queue, msgLen:%d pConn:%p pTimer:%p",
pServer->label, chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], pHeader->msgLen, pConn, pServer->label, chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], pHeader->msgLen, pConn,
pConn->pTimer); pConn->pTimer);

4
src/util/src/tglobalcfg.c
View File

@ -556,7 +556,7 @@ void tsInitGlobalConfig() {
TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG, 0, 255, 0, TSDB_CFG_UTYPE_NONE); TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG, 0, 255, 0, TSDB_CFG_UTYPE_NONE);
tsInitConfigOption(cfg++, "sdbDebugFlag", &sdbDebugFlag, TSDB_CFG_VTYPE_INT, tsInitConfigOption(cfg++, "sdbDebugFlag", &sdbDebugFlag, TSDB_CFG_VTYPE_INT,
TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG, 0, 255, 0, TSDB_CFG_UTYPE_NONE); TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG, 0, 255, 0, TSDB_CFG_UTYPE_NONE);
tsInitConfigOption(cfg++, "taosDebugFlag", &taosDebugFlag, TSDB_CFG_VTYPE_INT, tsInitConfigOption(cfg++, "rpcDebugFlag", &rpcDebugFlag, TSDB_CFG_VTYPE_INT,
TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT, 0, 255, 0, TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT, 0, 255, 0,
TSDB_CFG_UTYPE_NONE); TSDB_CFG_UTYPE_NONE);
tsInitConfigOption(cfg++, "tmrDebugFlag", &tmrDebugFlag, TSDB_CFG_VTYPE_INT, tsInitConfigOption(cfg++, "tmrDebugFlag", &tmrDebugFlag, TSDB_CFG_VTYPE_INT,
@ -821,7 +821,7 @@ void tsSetAllDebugFlag() {
if (mdebugFlag != debugFlag) mdebugFlag = debugFlag; if (mdebugFlag != debugFlag) mdebugFlag = debugFlag;
if (ddebugFlag != debugFlag) ddebugFlag = debugFlag; if (ddebugFlag != debugFlag) ddebugFlag = debugFlag;
if (sdbDebugFlag != debugFlag) sdbDebugFlag = debugFlag; if (sdbDebugFlag != debugFlag) sdbDebugFlag = debugFlag;
if (taosDebugFlag != debugFlag) taosDebugFlag = debugFlag; if (rpcDebugFlag != debugFlag) rpcDebugFlag = debugFlag;
if (cdebugFlag != debugFlag) cdebugFlag = debugFlag; if (cdebugFlag != debugFlag) cdebugFlag = debugFlag;
if (jnidebugFlag != debugFlag) jnidebugFlag = debugFlag; if (jnidebugFlag != debugFlag) jnidebugFlag = debugFlag;
if (uDebugFlag != debugFlag) uDebugFlag = debugFlag; if (uDebugFlag != debugFlag) uDebugFlag = debugFlag;