Merge "Extra logs are added to the lua scripts at the debug level Whe…

…n lua script returns an error, we print the error string while asserting" into R2.22.x
Juniper · Mar 17, 2016 · 7891bc8 · 7891bc8
2 parents bccdfc6 + 38b2722
commit 7891bc8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/analytics/OpServerProxy.cc b/src/analytics/OpServerProxy.cc
@@ -8,6 +8,7 @@
 #include <tbb/mutex.h>
 #include <boost/bind.hpp>
 #include <boost/assign/list_of.hpp>
+#include <boost/assert.hpp>
 #include "base/util.h"
 #include "base/logging.h"
 #include "base/parse_object.h"
@@ -362,7 +363,7 @@ class OpServerProxy::OpServerImpl {
             // If redis returns error for async request, then perhaps it
             // is busy executing a script and it has reached the maximum
             // execution time limit.
-            assert(reply->type != REDIS_REPLY_ERROR);
+            BOOST_ASSERT_MSG(reply->type != REDIS_REPLY_ERROR, reply->str);
 
             if (rpi) {
                 rpi->ProcessCallback(reply);

diff --git a/src/analytics/flushuves.lua b/src/analytics/flushuves.lua
@@ -6,3 +6,4 @@ redis.log(redis.LOG_NOTICE,"WARNING: Flushing Redis UVE DB")
 local db = tonumber(ARGV[1])
 redis.call('select',db)
 redis.call('flushdb')
+redis.log(redis.LOG_DEBUG,"WARNING: Flushing Redis UVE DB done")
diff --git a/src/analytics/seqnum.lua b/src/analytics/seqnum.lua
@@ -17,4 +17,5 @@ for k,v in pairs(typ) do
 	end
 end
 redis.call('sadd', "NGENERATORS", ARGV[1]..":"..ARGV[2]..":"..ARGV[3]..":"..ARGV[4])
+redis.log(redis.LOG_DEBUG,"GetSeq for "..ARGV[1]..":"..ARGV[2]..":"..ARGV[3]..":"..ARGV[4].." done")
 return res
diff --git a/src/analytics/uveupdate.lua b/src/analytics/uveupdate.lua
@@ -18,6 +18,8 @@ local _table = KEYS[3]
 local _uves = KEYS[4]
 local _values = KEYS[5]
 
+redis.log(redis.LOG_DEBUG,"UVEUpdate for "..sm.." key "..key.." type:attr "..typ..":"..attr)
+
 redis.call('select',db)
 local ism = redis.call('sismember', 'NGENERATORS', sm)
 if ism == 0 then
@@ -35,4 +37,6 @@ redis.call('sadd',_table,key..':'..sm..":"..typ)
 redis.call('zadd',_uves,seq,key)
 redis.call('hset',_values,attr,val)
 
+redis.log(redis.LOG_DEBUG,"UVEUpdate for "..sm.." key "..key.." done")
+
 return true