fix(api-service): Fix api e2e deadlock #7575

SokratisVidros · 2025-01-23T22:04:30Z

What changed? Why was the change needed?

Screenshots

Expand for optional sections

Related enterprise PR

Special notes for your reviewer

netlify · 2025-01-23T22:04:46Z

✅ Deploy Preview for dev-web-novu ready!

Name	Link
🔨 Latest commit	`b2e0c5f`
🔍 Latest deploy log	https://app.netlify.com/sites/dev-web-novu/deploys/67a492332e967200085d800f
😎 Deploy Preview	https://deploy-preview-7575.dashboard.novu-staging.co
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

netlify · 2025-01-23T22:05:00Z

✅ Deploy Preview for dashboard-v2-novu-staging ready!

Name	Link
🔨 Latest commit	`b2e0c5f`
🔍 Latest deploy log	https://app.netlify.com/sites/dashboard-v2-novu-staging/deploys/67a49233699c0d00081a371f
😎 Deploy Preview	https://deploy-preview-7575.dashboard-v2.novu-staging.co
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

LetItRock · 2025-01-31T09:39:59Z

apps/api/src/app/events/e2e/trigger-event-topic.e2e.ts

@@ -446,7 +446,7 @@ describe('Topic Trigger Event #novu-v2', () => {
            content: '',
            metadata: {
              unit: DigestUnitEnum.SECONDS,
-              amount: 5,
+              amount: 1,


is this enough to digest?

LetItRock · 2025-01-31T09:43:33Z

libs/testing/src/jobs.service.ts

-      });
-    } while (totalCount > 0 || runningJobs > unfinishedJobs);
+      // Wait until there are no pending, queued or running jobs in Mongo
+      runningJobs = Math.max(


why we need to do max?

So that if any of us pass a -1 to change it.

I'm not sure if I get it, here we have the result of this.jobRepository.count

djabarovgeorge · 2025-02-03T13:19:13Z

libs/testing/src/jobs.service.ts

-      },
-    };
+  public async runAllDelayedJobsImmediately() {
+    const delayedJobs = await this.standardQueue.getDelayed();


i thought we used this more nested in the logic, but now i see that it was used only once in the tests.
i am not sure that i like this name because it is misleading, what it will do is run the current queued delay job immediately and not run all..
for example, if you will have workflow: in-app-1 -> delay-1 -> in-app-2 -> delay-2 -> in-app-3
and you run

await session.waitForJobCompletion(template?._id); await session.runAllDelayedJobsImmediately();

you could still have jobs in-app-2, delay-2, in-app-3 pending in the pipeline.

Good call out. I will update the name.

Fail faster in case a deadlock occurs in API e2e tests

Prevent deadlocks while waiting for the worker to process async jobs during e2e tests.

So that it runs in less than 5seconds that is the mocha timeout

SokratisVidros temporarily deployed to Linting January 23, 2025 22:04 — with GitHub Actions Inactive

github-actions bot added the @novu/api-service label Jan 23, 2025

SokratisVidros force-pushed the fix_api_e2e_deadlock branch from c3ad7dc to 0f6370d Compare January 29, 2025 10:54

SokratisVidros temporarily deployed to Linting January 29, 2025 10:54 — with GitHub Actions Inactive

SokratisVidros force-pushed the fix_api_e2e_deadlock branch from 0f6370d to 6149dd8 Compare January 29, 2025 10:59

SokratisVidros temporarily deployed to Linting January 29, 2025 10:59 — with GitHub Actions Inactive

SokratisVidros temporarily deployed to Linting January 29, 2025 11:32 — with GitHub Actions Inactive

SokratisVidros temporarily deployed to Linting January 29, 2025 11:49 — with GitHub Actions Inactive

SokratisVidros force-pushed the fix_api_e2e_deadlock branch from 51c682b to 97458bb Compare January 29, 2025 12:44

SokratisVidros temporarily deployed to Linting January 29, 2025 12:44 — with GitHub Actions Inactive

SokratisVidros changed the title ~~Fix api e2e deadlock~~ fix(api): Fix api e2e deadlock Jan 29, 2025

SokratisVidros temporarily deployed to Linting January 29, 2025 12:56 — with GitHub Actions Inactive

SokratisVidros changed the title ~~fix(api): Fix api e2e deadlock~~ fix(api-service): Fix api e2e deadlock Jan 29, 2025

SokratisVidros temporarily deployed to Linting January 29, 2025 13:51 — with GitHub Actions Inactive

SokratisVidros temporarily deployed to Linting January 31, 2025 09:25 — with GitHub Actions Inactive

SokratisVidros marked this pull request as ready for review January 31, 2025 09:33

LetItRock approved these changes Jan 31, 2025

View reviewed changes

djabarovgeorge reviewed Feb 3, 2025

View reviewed changes

SokratisVidros force-pushed the fix_api_e2e_deadlock branch from c21edb0 to c411dc8 Compare February 5, 2025 11:21

SokratisVidros temporarily deployed to Linting February 5, 2025 11:21 — with GitHub Actions Inactive

SokratisVidros temporarily deployed to Linting February 5, 2025 17:51 — with GitHub Actions Inactive

SokratisVidros added 12 commits February 6, 2025 12:42

fix(api-service): Teach mocha to timeout faster

4725e4a

Fail faster in case a deadlock occurs in API e2e tests

fix(testing): Refactor worker waiting logic during e2e

71daac7

Prevent deadlocks while waiting for the worker to process async jobs during e2e tests.

fix(api): Make e2e digest test faster

01f0a78

So that it runs in less than 5seconds that is the mocha timeout

fixup! fix(api): Make e2e digest test faster

d0240db

fix(api): Try only one test

9972a8f

fix(api): Clean up job service testing helpers

9e54fd6

Add more logging

438fe30

fixup! Add more logging

da9d58f

fixup! fixup! Add more logging

1289f46

More fixes

990f3ca

Update package.json

688dae7

fixup! Update package.json

b2e0c5f

SokratisVidros force-pushed the fix_api_e2e_deadlock branch from dd415ce to b2e0c5f Compare February 6, 2025 10:42

SokratisVidros temporarily deployed to Linting February 6, 2025 10:43 — with GitHub Actions Inactive

SokratisVidros merged commit 79739cb into next Feb 6, 2025
32 of 37 checks passed

SokratisVidros deleted the fix_api_e2e_deadlock branch February 6, 2025 10:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(api-service): Fix api e2e deadlock #7575

fix(api-service): Fix api e2e deadlock #7575

SokratisVidros commented Jan 23, 2025

netlify bot commented Jan 23, 2025 •

edited

Loading

netlify bot commented Jan 23, 2025 •

edited

Loading

LetItRock Jan 31, 2025

LetItRock Jan 31, 2025

SokratisVidros Jan 31, 2025

djabarovgeorge Feb 3, 2025

djabarovgeorge Feb 3, 2025

SokratisVidros Feb 5, 2025

fix(api-service): Fix api e2e deadlock #7575

fix(api-service): Fix api e2e deadlock #7575

Conversation

SokratisVidros commented Jan 23, 2025

What changed? Why was the change needed?

Screenshots

Related enterprise PR

Special notes for your reviewer

netlify bot commented Jan 23, 2025 • edited Loading

✅ Deploy Preview for dev-web-novu ready!

netlify bot commented Jan 23, 2025 • edited Loading

✅ Deploy Preview for dashboard-v2-novu-staging ready!

LetItRock Jan 31, 2025

Choose a reason for hiding this comment

LetItRock Jan 31, 2025

Choose a reason for hiding this comment

SokratisVidros Jan 31, 2025

Choose a reason for hiding this comment

djabarovgeorge Feb 3, 2025

Choose a reason for hiding this comment

djabarovgeorge Feb 3, 2025

Choose a reason for hiding this comment

SokratisVidros Feb 5, 2025

Choose a reason for hiding this comment

netlify bot commented Jan 23, 2025 •

edited

Loading

netlify bot commented Jan 23, 2025 •

edited

Loading