Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-24 03:05:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11369 from steven-zou/fix/issue_#11361

Browse Source 
fix[lua_scripts]:add default values for tonumber
This commit is contained in:
Steven Zou 2020-04-01 19:01:02 +08:00 committed by GitHub
commit 1f6301267c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jobservice/common/rds/scripts.go
View File

@ -30,7 +30,8 @@ var luaFuncStCodeText = `
local stMap = { ['Pending'] = 0, ['Scheduled'] = 1, ['Running'] = 2, ['Success'] = 3, ['Stopped'] = 3, ['Error'] = 3 } local stMap = { ['Pending'] = 0, ['Scheduled'] = 1, ['Running'] = 2, ['Success'] = 3, ['Stopped'] = 3, ['Error'] = 3 }
local function stCode(status) local function stCode(status)
return stMap[status] -- return 0 as default status
return stMap[status] or 0
end end
` `
@ -39,8 +40,8 @@ var luaFuncCompareText = `
local function compare(status, revision, checkInT) local function compare(status, revision, checkInT)
local sCode = stCode(status) local sCode = stCode(status)
local aCode = stCode(ARGV[1]) local aCode = stCode(ARGV[1])
local aRev = tonumber(ARGV[2]) local aRev = tonumber(ARGV[2]) or 0
local aCheckInT = tonumber(ARGV[3]) local aCheckInT = tonumber(ARGV[3]) or 0
if revision < aRev or if revision < aRev or
( revision == aRev and sCode < aCode ) or ( revision == aRev and sCode < aCode ) or
@ -64,17 +65,18 @@ end
var setStatusScriptText = fmt.Sprintf(` var setStatusScriptText = fmt.Sprintf(`
%s %s
local res, st, rev, aCode, aRev local res, st, code, rev, aCode, aRev
res = redis.call('hmget', KEYS[1], 'status', 'revision') res = redis.call('hmget', KEYS[1], 'status', 'revision')
if res then if res then
st = res[1] st = res[1]
code = stCode(st)
aCode = stCode(ARGV[1]) aCode = stCode(ARGV[1])
rev = tonumber(res[2]) rev = tonumber(res[2]) or 0
aRev = tonumber(ARGV[2]) aRev = tonumber(ARGV[2]) or 0
-- set same status repeatedly is allowed -- set same status repeatedly is allowed
if rev < aRev or ( rev == aRev and (stCode(st) < aCode or st == ARGV[1])) then if rev < aRev or ( rev == aRev and (code < aCode or st == ARGV[1])) then
redis.call('hmset', KEYS[1], 'status', ARGV[1], 'update_time', ARGV[3]) redis.call('hmset', KEYS[1], 'status', ARGV[1], 'update_time', ARGV[3])
-- update inprogress track if necessary -- update inprogress track if necessary
if aCode == 3 then if aCode == 3 then
@ -117,8 +119,8 @@ local res, st, rev, checkInAt, ack
res = redis.call('hmget', KEYS[1], 'status', 'revision', 'check_in_at', 'ack') res = redis.call('hmget', KEYS[1], 'status', 'revision', 'check_in_at', 'ack')
if res then if res then
st = res[1] st = res[1]
rev = tonumber(res[2]) rev = tonumber(res[2]) or 0
checkInAt = tonumber(res[3]) checkInAt = tonumber(res[3]) or 0
ack = res[4] ack = res[4]
local reply = compare(st, rev, checkInAt) local reply = compare(st, rev, checkInAt)
@ -164,7 +166,7 @@ var hookAckScriptText = fmt.Sprintf(`
local function canSetAck(jk, nrev) local function canSetAck(jk, nrev)
local res = redis.call('hmget', jk, 'revision', 'ack') local res = redis.call('hmget', jk, 'revision', 'ack')
if res then if res then
local rev = tonumber(res[1]) local rev = tonumber(res[1]) or 0
local ackv = res[2] local ackv = res[2]
if ackv then if ackv then
@ -220,7 +222,7 @@ var HookAckScript = redis.NewScript(2, hookAckScriptText)
// ARGV[2]: start status // ARGV[2]: start status
// ARGV[3]: revision of job stats // ARGV[3]: revision of job stats
var statusResetScriptText = ` var statusResetScriptText = `
local now = tonumber(ARGV[3]) local now = tonumber(ARGV[3]) or 0
-- reset status and revision -- reset status and revision
redis.call('hmset', KEYS[1], 'status', ARGV[2], 'revision', now, 'update_time', now) redis.call('hmset', KEYS[1], 'status', ARGV[2], 'revision', now, 'update_time', now)