修复阿里云redis集群调用Lua脚本报错的问题

Boris · Boris · commit 421f2814dac0 · 2021-03-23T21:40:34.000+08:00
diff --git a/feapder/core/scheduler.py b/feapder/core/scheduler.py
@@ -332,18 +332,18 @@ def check_task_status(self):
             else:
                 # 判断时间间隔是否超过20分钟
                 lua = """
-                    local key = KEYS[1]
+                    -- local key = KEYS[1]
                     local field = ARGV[1]
                     local current_timestamp = ARGV[2]
 
                     -- 取值
-                    local last_timestamp = redis.call('hget', key, field)
+                    local last_timestamp = redis.call('hget', KEYS[1], field)
                     if last_timestamp and current_timestamp - last_timestamp >= 1200 then
                         return current_timestamp - last_timestamp -- 返回任务停滞时间 秒
                     end
 
                     if not last_timestamp then
-                        redis.call('hset', key, field, current_timestamp)
+                        redis.call('hset', KEYS[1], field, current_timestamp)
                     end
 
                     return 0
diff --git a/feapder/db/redisdb.py b/feapder/db/redisdb.py
@@ -325,7 +325,7 @@ def zrangebyscore(self, table, priority_min, priority_max, count=None, is_pop=Tr
 
         # 使用lua脚本， 保证操作的原子性
         lua = """
-            local key = KEYS[1]
+            -- local key = KEYS[1]
             local min_score = ARGV[2]
             local max_score = ARGV[3]
             local is_pop = ARGV[4]
@@ -334,15 +334,15 @@ def zrangebyscore(self, table, priority_min, priority_max, count=None, is_pop=Tr
             -- 取值
             local datas = nil
             if count then
-                datas = redis.call('zrangebyscore', key, min_score, max_score, 'limit', 0, count)
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score, 'limit', 0, count)
             else
-                datas = redis.call('zrangebyscore', key, min_score, max_score)
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score)
             end
 
             -- 删除redis中刚取到的值
             if (is_pop) then
                 for i=1, #datas do
-                    redis.call('zrem', key, datas[i])
+                    redis.call('zrem', KEYS[1], datas[i])
                 end
             end
 
@@ -377,7 +377,7 @@ def zrangebyscore_increase_score(
 
         # 使用lua脚本， 保证操作的原子性
         lua = """
-            local key = KEYS[1]
+            -- local key = KEYS[1]
             local min_score = ARGV[1]
             local max_score = ARGV[2]
             local increase_score = ARGV[3]
@@ -386,14 +386,14 @@ def zrangebyscore_increase_score(
             -- 取值
             local datas = nil
             if count then
-                datas = redis.call('zrangebyscore', key, min_score, max_score, 'limit', 0, count)
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score, 'limit', 0, count)
             else
-                datas = redis.call('zrangebyscore', key, min_score, max_score)
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score)
             end
 
             --修改优先级
             for i=1, #datas do
-                redis.call('zincrby', key, increase_score, datas[i])
+                redis.call('zincrby', KEYS[1], increase_score, datas[i])
             end
 
             return datas
@@ -426,7 +426,7 @@ def zrangebyscore_set_score(
 
         # 使用lua脚本， 保证操作的原子性
         lua = """
-            local key = KEYS[1]
+            -- local key = KEYS[1]
             local min_score = ARGV[1]
             local max_score = ARGV[2]
             local set_score = ARGV[3]
@@ -435,9 +435,9 @@ def zrangebyscore_set_score(
             -- 取值
             local datas = nil
             if count then
-                datas = redis.call('zrangebyscore', key, min_score, max_score, 'withscores','limit', 0, count)
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score, 'withscores','limit', 0, count)
             else
-                datas = redis.call('zrangebyscore', key, min_score, max_score, 'withscores')
+                datas = redis.call('zrangebyscore', KEYS[1], min_score, max_score, 'withscores')
             end
 
             local real_datas = {} -- 数据
@@ -448,7 +448,7 @@ def zrangebyscore_set_score(
 
                table.insert(real_datas, data) -- 添加数据
 
-               redis.call('zincrby', key, set_score - score, datas[i])
+               redis.call('zincrby', KEYS[1], set_score - score, datas[i])
             end
 
             return real_datas
@@ -641,13 +641,13 @@ def hget(self, table, key, is_pop=False):
             return self._redis.hget(table, key)
         else:
             lua = """
-                local key = KEYS[1]
+                -- local key = KEYS[1]
                 local field = ARGV[1]
 
                 -- 取值
-                local datas = redis.call('hget', key, field)
+                local datas = redis.call('hget', KEYS[1], field)
                 -- 删除值
-                redis.call('hdel', key, field)
+                redis.call('hdel', KEYS[1], field)
 
                 return datas
 
diff --git a/tests/spider/main.py b/tests/spider/main.py
@@ -46,4 +46,4 @@ def debug_spider_test():
         function=debug_spider_test,
     )
 
-    parser.start()
+    parser.start()

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ def debug_spider_test():`
`46`	`46`	`function=debug_spider_test,`
`47`	`47`	`)`
`48`	`48`
`49`		`- parser.start()`
	`49`	`+ parser.start()`