tested retry

Author: Moumouls

spec/DefinedSchemas.spec.js

@@ -501,11 +501,11 @@ describe('DefinedSchemas', () => {
     expect(before).toEqual(true);
     expect(server).toBeDefined();
   });
-  it('should use logger in case of error', async () => {
+  it('should use logger in case of error after 3 retries', async () => {
     const server = await reconfigureServer({ schemas: [{ className: '_User' }] });
-
     const error = new Error('A test error');
     const logger = require('../lib/logger').logger;
+    spyOn(DefinedSchemas.prototype, 'wait').and.resolveTo();
     spyOn(logger, 'error').and.callThrough();
     spyOn(Parse.Schema, 'all').and.callFake(async () => {
       throw error;
@@ -517,5 +517,10 @@ describe('DefinedSchemas', () => {
     ).execute();
 
     expect(logger.error).toHaveBeenCalledWith(error);
+    expect(DefinedSchemas.prototype.wait).toHaveBeenCalledTimes(3);
+    const calls = DefinedSchemas.prototype.wait.calls.all();
+    expect(calls[0].args[0]).toEqual(1000);
+    expect(calls[1].args[0]).toEqual(2000);
+    expect(calls[2].args[0]).toEqual(3000);
   });
 });

src/DefinedSchemas.js

@@ -45,12 +45,13 @@ export class DefinedSchemas {
   }
 
   async execute() {
+    let timeout;
     try {
       // Set up a time out in production
       // if we fail to get schema
       // pm2 or K8s and many other process managers will try to restart the process
       // after the exit
-      const timeout = setTimeout(() => {
+      timeout = setTimeout(() => {
         if (process.env.NODE_ENV === 'production') process.exit(1);
       }, 20000);
       // Hack to force session schema to be created
@@ -60,13 +61,14 @@ export class DefinedSchemas {
       await Promise.all(this.localSchemas.map(async localSchema => this.saveOrUpdate(localSchema)));
       await this.enforceCLPForNonProvidedClass();
     } catch (e) {
-      if (this.retries <= this.maxRetries) {
+      if (timeout) clearTimeout(timeout);
+      if (this.retries < this.maxRetries) {
         this.retries++;
         // first retry 1sec, 2sec, 3sec total 6sec retry sequence
         // retry will only happen in case of deploying multi parse server instance
         // at the same time
         // modern systems like k8 avoid this by doing rolling updates
-        await new Promise(resolve => setTimeout(resolve, 1000 * this.retries));
+        await this.wait(1000 * this.retries);
         await this.execute();
       } else {
         logger.error(e);
@@ -75,6 +77,11 @@ export class DefinedSchemas {
     }
   }
 
+  // Required for testing purpose
+  async wait(time) {
+    await new Promise(resolve => setTimeout(resolve, time));
+  }
+
   async enforceCLPForNonProvidedClass() {
     const nonProvidedClasses = this.allCloudSchemas.filter(
       cloudSchema =>