feat: better timeout logic for failed data layer push

Chia-Network · Mar 6, 2022 · 8d9aa40 · 8d9aa40
1 parent 6199b2c
commit 8d9aa40
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -78,7 +78,7 @@ export const pushChangeListToDataLayer = async (storeId, changelist) => {
 
     return false;
   } catch (error) {
-    console.log(error);
+    console.log('There was an error pushing your changes to the datalayer');
   }
 };
 
@@ -189,6 +189,7 @@ export const dataLayerAvailable = async () => {
     return false;
   } catch (error) {
     console.error(error);
+
     return false;
   }
 };

diff --git a/src/datalayer/writeService.js b/src/datalayer/writeService.js
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 import * as dataLayer from './persistance';
 import wallet from './wallet';
 import * as simulator from './simulator';
@@ -27,14 +29,33 @@ const syncDataLayer = async (storeId, data) => {
   await pushChangesWhenStoreIsAvailable(storeId, changeList);
 };
 
-const retry = (storeId, changeList) => {
+const retry = (storeId, changeList, failedCallback, retryAttempts) => {
+  console.log('RETRYING...', retryAttempts);
+  if (retryAttempts >= 10) {
+    console.log(
+      'Could not push changelist to datalayer after retrying 10 times',
+    );
+    failedCallback();
+    return;
+  }
+
   setTimeout(async () => {
     console.log('Retrying...', storeId);
-    await pushChangesWhenStoreIsAvailable(storeId, changeList);
+    await pushChangesWhenStoreIsAvailable(
+      storeId,
+      changeList,
+      failedCallback,
+      retryAttempts + 1,
+    );
   }, 30000);
 };
 
-const pushChangesWhenStoreIsAvailable = async (storeId, changeList) => {
+const pushChangesWhenStoreIsAvailable = async (
+  storeId,
+  changeList,
+  failedCallback = _.noop,
+  retryAttempts = 0,
+) => {
   if (process.env.USE_SIMULATOR === 'true') {
     return simulator.pushChangeListToDataLayer(storeId, changeList);
   } else {
@@ -50,16 +71,16 @@ const pushChangesWhenStoreIsAvailable = async (storeId, changeList) => {
       );
 
       if (!success) {
-        retry(storeId, changeList);
+        retry(storeId, changeList, failedCallback, retryAttempts);
       }
     } else {
-      retry(storeId, changeList);
+      retry(storeId, changeList, failedCallback, retryAttempts);
     }
   }
 };
 
-const pushDataLayerChangeList = (storeId, changeList) => {
-  pushChangesWhenStoreIsAvailable(storeId, changeList);
+const pushDataLayerChangeList = (storeId, changeList, failedCallback) => {
+  pushChangesWhenStoreIsAvailable(storeId, changeList, failedCallback);
 };
 
 const dataLayerAvailable = async () => {

diff --git a/src/models/staging/staging.model.js b/src/models/staging/staging.model.js
@@ -219,6 +219,13 @@ class Staging extends Model {
     await datalayer.pushDataLayerChangeList(
       myOrganization.registryId,
       finalChangeList,
+      async () => {
+        // The push failed so revert the commited staging records.
+        await Staging.update(
+          { commited: false },
+          { where: { commited: true } },
+        );
+      },
     );
   }
 }