Skip to content

Commit 9f639b4

Browse files
committed
remove member locks when activity not exists
1 parent f55c509 commit 9f639b4

File tree

1 file changed

+6
-34
lines changed

1 file changed

+6
-34
lines changed

services/apps/data_sink_worker/src/service/activity.service.ts

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -658,15 +658,6 @@ export default class ActivityService extends LoggerBase {
658658

659659
// release lock for member inside activity exists - this migth be redundant, but just in case
660660
} else {
661-
// acquiring lock for member inside activity not exists
662-
await acquireLock(
663-
this.redisClient,
664-
`member:processing:${tenantId}:${platform}:${username}`,
665-
'check-member-inside-activity-not-exists',
666-
MEMBER_LOCK_EXPIRE_AFTER,
667-
MEMBER_LOCK_TIMEOUT_AFTER,
668-
)
669-
670661
this.log.trace('We did not find an existing activity. Creating a new one.')
671662
createActivity = true
672663

@@ -692,12 +683,6 @@ export default class ActivityService extends LoggerBase {
692683
},
693684
dbMember,
694685
false,
695-
async () =>
696-
await releaseLock(
697-
this.redisClient,
698-
`member:processing:${tenantId}:${platform}:${username}`,
699-
'check-member-inside-activity-not-exists',
700-
),
701686
)
702687
memberId = dbMember.id
703688
} else {
@@ -720,12 +705,6 @@ export default class ActivityService extends LoggerBase {
720705
organizations: member.organizations,
721706
},
722707
false,
723-
async () =>
724-
await releaseLock(
725-
this.redisClient,
726-
`member:processing:${tenantId}:${platform}:${username}`,
727-
'check-member-inside-activity-not-exists',
728-
),
729708
)
730709
}
731710

@@ -821,19 +800,12 @@ export default class ActivityService extends LoggerBase {
821800
)
822801
}
823802
} finally {
824-
// release locks in parallel no matter what
825-
await Promise.all([
826-
releaseLock(
827-
this.redisClient,
828-
`member:processing:${tenantId}:${platform}:${username}`,
829-
'check-member-inside-activity-exists',
830-
),
831-
releaseLock(
832-
this.redisClient,
833-
`member:processing:${tenantId}:${platform}:${username}`,
834-
'check-member-inside-activity-not-exists',
835-
),
836-
])
803+
// release locks matter what
804+
await releaseLock(
805+
this.redisClient,
806+
`member:processing:${tenantId}:${platform}:${username}`,
807+
'check-member-inside-activity-exists',
808+
)
837809
}
838810
})
839811

0 commit comments

Comments
 (0)