fix: prevent subscribe task overrun

Chia-Network · Dec 20, 2024 · 5315675 · 5315675
1 parent c7d34ec
commit 5315675
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -596,7 +596,7 @@ const getSubscriptions = async () => {
       .send({});
 
     const data = response.body;
-    logger.debug(`data returned from ${url}: ${data.store_ids}`);
+    logger.debug(`data returned from ${url}: ${JSON.stringify(data)}`);
 
     if (data.success) {
       return { success: true, storeIds: data.store_ids };

diff --git a/src/datalayer/syncService.js b/src/datalayer/syncService.js
@@ -80,7 +80,9 @@ const getSubscribedStoreData = async (storeId) => {
     );
     const { confirmed } = await dataLayer.getRoot(storeId);
     if (!confirmed) {
-      throw new Error(`Store not found in DataLayer: ${storeId}.`);
+      throw new Error(
+        `${storeId} has not yet been confirmed. cannot get root.`,
+      );
     } else {
       logger.debug(
         `store data is confirmed available, proceeding to get data ${storeId}`,

diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -595,8 +595,7 @@ class Organization extends Model {
           onTimeout(error);
         }
         logger.debug(`${error.message}. RETRYING`);
-      } finally {
-        await new Promise((resolve) => setTimeout(resolve, 300));
+        await new Promise((resolve) => setTimeout(resolve, 10000));
       }
     }
 
@@ -621,8 +620,7 @@ class Organization extends Model {
           onTimeout(error);
         }
         logger.debug(`${error.message}. RETRYING`);
-      } finally {
-        await new Promise((resolve) => setTimeout(resolve, 300));
+        await new Promise((resolve) => setTimeout(resolve, 3000));
       }
     }
 

diff --git a/src/tasks/sync-default-organizations.js b/src/tasks/sync-default-organizations.js
@@ -26,7 +26,7 @@ const task = new Task('sync-default-organizations', async () => {
       const userDeletedOrgs = await Meta.getUserDeletedOrgUids();
 
       for (const { orgUid } of defaultOrgRecords) {
-        if (userDeletedOrgs.includes(orgUid)) {
+        if (userDeletedOrgs?.includes(orgUid)) {
           logger.verbose(
             `default organization ${orgUid} has been explicitly removed from this instance. not adding or checking that it exists`,
           );

diff --git a/src/tasks/validate-organization-table-and-subscriptions.js b/src/tasks/validate-organization-table-and-subscriptions.js
@@ -26,7 +26,7 @@ const task = new Task('validate-organization-table', async () => {
       for (const organization of organizations) {
         // this is in the loop to prevent this task from trying to operate on an organization that was deleted while it was running
         const deletedOrganizations = await Meta.getUserDeletedOrgUids();
-        if (deletedOrganizations.includes(organization.orgUid)) {
+        if (deletedOrganizations?.includes(organization.orgUid)) {
           continue;
         }
 
@@ -46,7 +46,7 @@ const task = new Task('validate-organization-table', async () => {
   } catch (error) {
     logger.error(
       `failed to validate default organization records and subscriptions. Error ${error.message}. ` +
-        `Retrying in ${CONFIG?.TASKS?.VALIDATE_ORGANIZATION_TABLE_TASK_INTERVAL || 30} seconds`,
+        `Retrying in ${CONFIG?.TASKS?.VALIDATE_ORGANIZATION_TABLE_TASK_INTERVAL || 900} seconds`,
     );
   }
 });
@@ -61,7 +61,7 @@ const task = new Task('validate-organization-table', async () => {
  */
 const job = new SimpleIntervalJob(
   {
-    seconds: CONFIG?.TASKS?.VALIDATE_ORGANIZATION_TABLE_TASK_INTERVAL || 30,
+    seconds: CONFIG?.TASKS?.VALIDATE_ORGANIZATION_TABLE_TASK_INTERVAL || 900,
     runImmediately: true,
   },
   task,