军团：修改锁逻辑

game-server/app/servers/battle/handler/guildHandler.ts

@@ -309,7 +309,7 @@ export class GuildHandler {
         let hasGuild = false;
         if(isAuto) { // 自动加入
             const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId);
-            if(joinResult.status == 0) {
+            if(joinResult.status == -1) {
                 return joinResult.resResult;
             }
 
@@ -370,7 +370,7 @@ export class GuildHandler {
     
             for(let { roleId } of applyList) {
                 const joinResult = await joinGuild(code, guild.name, guild.lv, roleId, serverId);
-                if(joinResult.status == 0) continue;
+                if(joinResult.status == -1) continue;
 
                 // 更新人数增加
                 this.app.rpc.chat.guildRemote.updateInfo.toServer(CHAT_SERVER, code, { memberCnt: joinResult.memberCnt, guildCe: joinResult.guildCe });
@@ -493,7 +493,7 @@ export class GuildHandler {
             const guild = await GuildModel.findByCode(guildCode, serverId);
     
             const joinResult = await joinGuild(guildCode, guild.name, guild.lv, roleId, serverId);
-            if(joinResult.status == 0) {
+            if(joinResult.status == -1) {
                 return joinResult.resResult;
             }
 

game-server/app/services/guildService.ts

@@ -13,7 +13,7 @@ import { ARMY } from "../pubUtils/dicParam";
 import { sendMail } from "./mailService";
 import { setRank, getMyRank, initSingleRank } from "./redisService";
 import { GuildRankParam, GuildLeader } from "../domain/rank";
-import { lockData, isLocked } from '../services/redLockService';
+import { lockData, lockDataNoRetry } from '../services/redLockService';
 import { ErrLogModel } from '../db/ErrLog'; 
 import { MailType, MailModel } from '../db/Mail';
 import { pushMail } from '../pubUtils/interface';
@@ -43,42 +43,46 @@ export async function checkAuth(func: number, roleId: string, code?: string, use
 export async function joinGuild(code: string, guildName: string, lv: number, roleId: string, serverId: number) {
 
     // 周结算锁
-    let isWeeklySum = await isLocked(serverId, DATA_NAME.WEEKLY_GUILD_SUM, code);
+    let weeklySumLock = await lockDataNoRetry(serverId, DATA_NAME.WEEKLY_GUILD_SUM, code);
-    if(isWeeklySum) return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
+    if(!!weeklySumLock.err) {
+        weeklySumLock.releaseCallback();
+        return { status: -1, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
+    }
+    weeklySumLock.releaseCallback();
 
     // 人数锁
     let res:any = await lockData(serverId, DATA_NAME.JOIN_GUILD, code);// 加锁
-    if (!!res.err) return { status: 0, resResult: resResult(STATUS.REDLOCK_ERR) };
+    if (!!res.err) return { status: -1, resResult: resResult(STATUS.REDLOCK_ERR) };
     
     const result = await RoleModel.joinGuild(roleId, code, guildName);
     if(!result) {
         res.releaseCallback();//解锁
-        return { status: 0, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
+        return { status: -1, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
     }
 
     const dicCenterBase = gameData.centerBase.get(lv);
     if(!dicCenterBase) {
         res.releaseCallback();//解锁
-        return { status: 0, resResult: resResult(STATUS.DIC_DATA_NOT_FOUND) };
+        return { status: -1, resResult: resResult(STATUS.DIC_DATA_NOT_FOUND) };
     }
     const maxMemberCnt = dicCenterBase.peopleNum;
-    const guild = await GuildModel.addGuild(code, roleId, maxMemberCnt, serverId, result.ce);
+    const guild = await GuildModel.addMember(code, roleId, maxMemberCnt, serverId, result.ce);
     if(!guild) {
         res.releaseCallback();//解锁
-        return { status: 0, resResult: resResult(STATUS.GUILD_MEMBER_MAX) };
+        return { status: -1, resResult: resResult(STATUS.GUILD_MEMBER_MAX) };
     }
 
     const role = await RoleModel.findByRoleId(roleId);
     const userGuild = await UserGuildModel.createUserGuild(guild.code, role, false);
     if(!userGuild) {
         res.releaseCallback();//解锁
-        return { status: 0, resResult: resResult(STATUS.GUILD_CREATE_ERROR) };
+        return { status: -1, resResult: resResult(STATUS.GUILD_CREATE_ERROR) };
     }
 
     await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
 
     res.releaseCallback();//解锁
-    return { status: 1, guild, userGuild, roleName: role.roleName, memberCnt: guild.memberCnt, guildCe: guild.guildCe }
+    return { status: 0, guild, userGuild, roleName: role.roleName, memberCnt: guild.memberCnt, guildCe: guild.guildCe }
 }
 
 /**
@@ -97,14 +101,13 @@ export async function getGuildWithRefActive(guildCode: string, serverId: number)
         return false;
     }
 
-    console.log(JSON.stringify(guild));
     const now = new Date();
     let { activeDaily, refTimeDaily} = guild;
 
     let isRefDaily = shouldRefresh(refTimeDaily, now, 0);
     if(isRefDaily) {
         activeDaily = 0; refTimeDaily = now;
-        guild = await GuildModel.updateInfo(guildCode, { activeDaily, refTimeDaily }, {});
+        guild = await GuildModel.updateInfoWithLeader(guildCode, { activeDaily, refTimeDaily }, {});
     }
     res.releaseCallback();//解锁
 
@@ -137,8 +140,12 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
     if(!guild) return { status: 0, resResult: resResult(STATUS.GUILD_NOT_FOUND) };
 
     // 周结算锁
-    let isWeeklySum = await isLocked(serverId, DATA_NAME.WEEKLY_GUILD_SUM, guildCode);
+    let weeklySumLock = await lockDataNoRetry(serverId, DATA_NAME.WEEKLY_GUILD_SUM, guildCode);
-    if(isWeeklySum) return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
+    if(!!weeklySumLock.err) {
+        weeklySumLock.releaseCallback();
+        return { status: 0, resResult: resResult(STATUS.GUILD_WEEKLY_SUM) };
+    }
+    weeklySumLock.releaseCallback();
 
     let {activeRecord} = userGuild;
     if(id != 0) { // 用于debug，传0时直接增加活跃
@@ -217,7 +224,7 @@ export async function settleGuildWeekly() {
 
     // 周结算时，1. 不能变动memberCnt 2.玩家activeWeekly不能变动 3.公会activeWeekly不能变动
     for(let { code, memberCnt, serverId } of guildList) {
-        let res:any = await lockData(serverId, DATA_NAME.WEEKLY_GUILD_SUM, code);//加锁
+        let res:any = await lockDataNoRetry(serverId, DATA_NAME.WEEKLY_GUILD_SUM, code);//加锁
         if (!!res.err) {
             await ErrLogModel.create(`settle guild lock data error: ${res.err}`)
         }

game-server/app/services/redLockService.ts

@@ -11,6 +11,8 @@ export class RedlockService {
     _redisClient: any;
     ttl: number;
     redlock: any;
+    redlockNoRetry: any; // 用于检查锁是否存在，一锁上立刻会解锁
+
     constructor(redisClient) {
         this._redisClient = redisClient;
         this._redisClient.on("error", function (err) { 
@@ -41,6 +43,20 @@ export class RedlockService {
         this.redlock.on('clientError', function(err) {
             console.error('A redis error has occurred:', err);
         });
+
+        this.redlockNoRetry = new Redlock(
+            [this._redisClient],
+            {
+                driftFactor: 0.01, // time in ms
+                retryCount:  0,
+                retryDelay:  200, // time in ms
+                retryJitter:  200 // time in ms
+            }
+        );
+    
+        this.redlockNoRetry.on('clientError', function(err) {
+            console.error('A redis error has occurred:', err);
+        });
     }
     
 }
@@ -51,6 +67,7 @@ export async function lockData(serverId: number, dataName: string, id: string )
     console.log(' lockKey = '+ lockKey);
     return await lock(lockKey);
 }
+
 function lock(lockKey: string) {
     return _redlockCache.redlock.lock(lockKey, _redlockCache.ttl).then(function(lock) {
         setLock(lockKey, lock);
@@ -64,8 +81,26 @@ export async function releaseCallback(lockKey: string) {
     releaseLock(lockKey);
 }
 
-export async function isLocked(serverId: number, dataName: string, id: string) {
+/**
+ * 主要用于检查是否锁定，锁上后立刻会解锁，所以entryCount为0
+ * 
+ * @param serverId 区服
+ * @param dataName 锁名
+ * @param id 锁id
+ */
+export async function lockDataNoRetry(serverId: number, dataName: string, id: string ) {
     let key = 'serverId_'+serverId+'_'+dataName+'_'+id;
     let lockKey = 'locks:' + key;
-    return getLock(lockKey);
+    console.log(' lockKey = '+ lockKey);
+    return await lockNoRetry(lockKey);
+}
+
+function lockNoRetry(lockKey: string) {
+    return _redlockCache.redlockNoRetry.lock(lockKey, _redlockCache.ttl).then(function(lock) {
+        setLock(lockKey, lock);
+        return {err: null, releaseCallback: releaseCallback.bind(null, lockKey)};
+    }).catch(function(err) {
+        console.error(err);
+        return { err };
+    });
 }

shared/db/Guild.ts

@@ -151,7 +151,7 @@ export default class Guild extends BaseModel {
         return result;
     }
 
-    public static async addGuild(code: string, roleId: string, maxMemberCnt: number, serverId: number, ce: number) {
+    public static async addMember(code: string, roleId: string, maxMemberCnt: number, serverId: number, ce: number) {
         let result: GuildType = await GuildModel.findOneAndUpdate({ code, memberCnt: {$lt: maxMemberCnt }, serverId }, { $inc: { memberCnt: 1, guildCe: ce }, $push: { members: roleId } }, { new: true }).lean({getters: true});
         if(result && result.memberCnt >= maxMemberCnt) {
             result = await GuildModel.findOneAndUpdate({ code }, { $set: { isMemberMax: true } }).lean({getters: true});
@@ -175,6 +175,13 @@ export default class Guild extends BaseModel {
         return result;
     }
 
+    public static async updateInfoWithLeader(code: string, update: GuildUpdateParam, incParam?: { managerCnt?: number, fund?: number, activeDaily?: number, activeWeekly?: number }, select?: string) {
+        const result: GuildType = await GuildModel.findOneAndUpdate({ code }, { $set: update, $inc: incParam }, { new: true })
+        .populate('leader', {roleId: 1, roleName: 1, sHid: 1, headHid: 1, lv: 1, quitTime: 1, ce: 1, title: 1, _id: 0}, 'Role')
+        .select(select).lean();
+        return result;
+    }
+
     public static async upStructure(code: string, id: number, select?: string) {
         if (id == GUILD_STRUCTURE.ARMY_CENTER) {
             const result: GuildType = await GuildModel.findOneAndUpdate({ code, 'structure.id': id }, { $inc: { 'structure.$.lv': 1, lv: 1 }, $set: { isMemberMax: false } }, { new: true }).select(select).lean();