feat(h5-test): add ckv report

Tencent · Jul 9, 2018 · b22f8e0 · b22f8e0
1 parent 2096405
commit b22f8e0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/bin/tsw/api/tnm2/index.js b/bin/tsw/api/tnm2/index.js
@@ -9,7 +9,7 @@
 
 
 const serverInfo = require('serverInfo.js');
-const mapping = require('./mapping.json');
+const mapping = require('api/tnm2/mapping.json');
 const url = require('url');
 const Deferred = require('util/Deferred');
 const cluster = require('cluster');

diff --git a/bin/tsw/api/tnm2/mapping.json b/bin/tsw/api/tnm2/mapping.json
@@ -48,8 +48,9 @@
     "SUM_TSW_WEBSOCKET_ERROR"   : 1253122,
     "SUM_TSW_WEBSOCKET_CLOSE"   : 1253126,
 
-    "AVG_TSW_CKV_QUEUE_COST"    : 1253127,
-    "AVG_TSW_CKV_COST"          : 1253129,
+    "SUM_TSW_CKV_CMD"           : 1253127,
+    "AVG_TSW_CKV_QUEUE_COST"    : 1253128,
+    "AVG_TSW_CKV_CMD_COST"      : 1253129,
 
     "AVG_TSW_CPU_LOAD_1"        : 1280713,
     "AVG_TSW_CPU_LOAD_5"        : 1280714,

diff --git a/bin/tsw/pool/cmem.l5.js b/bin/tsw/pool/cmem.l5.js
@@ -11,6 +11,7 @@
 const logger = require('logger');
 const Queue = require('util/Queue');
 const dcapi = require('api/libdcapi/dcapi.js');
+const tnm2 = require('api/tnm2');
 const L5 = require('api/L5/L5.api.js');
 const { isWin32Like } = require('util/isWindows.js');
 let cache = global[__filename];
@@ -83,7 +84,13 @@ function queueWrap(memcached) {
             const servers = memcached.servers && memcached.servers[0];
             const start = Date.now();
 
+            tnm2.Attr_API('SUM_TSW_CKV_CMD', 1);
+
             queue.queue(function() {
+                const startQueue = Date.now();
+                const costQueue = startQueue - start;
+
+                tnm2.Attr_API_Set('AVG_TSW_CKV_QUEUE_COST', costQueue);
 
                 const fn = (function(queryCompiler) {
                     return function() {
@@ -119,6 +126,8 @@ function queueWrap(memcached) {
                                     }
                                 }
 
+                                tnm2.Attr_API_Set('AVG_TSW_CKV_CMD_COST', Date.now() - startQueue);
+
                                 dcapi.report({
                                     key: 'EVENT_TSW_MEMCACHED',
                                     toIp: toIp,