fix: subscribe to org store before checking sync status in syncOrganizationMeta

TheLastCicada · TheLastCicada · commit 037c5f125be9 · 2026-04-23T14:00:11.000-07:00
Mirrors the subscribe-first pattern established in #1600 af06a65 (for governance sync) and 6d41b71 (for reconcileOrganization). Without subscribe-first, the getDataLayerStoreSyncStatus pre-check added to syncOrganizationMeta has a permanent-skip-loop failure mode: if the DataLayer node has no record of an org store (e.g. after a DataLayer DB reset), the status check returns falsy, the loop iteration skips the org, and no subsequent run ever subscribes — the org's metadata stops syncing forever. Also adds a falsy-return guard on subscribeToStoreOnDataLayer: the wrapper in src/datalayer/persistance.js returns false (without throwing) on the common failure paths (no storeId, getSubscriptions RPC failure). Without the falsy check, a datalayer-unreachable failure would slip past the try/catch and produce a misleading "not yet synced" log. Applies to both V1 Organization.syncOrganizationMeta and V2 OrganizationsV2.syncOrganizationMeta.
diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -1358,6 +1358,31 @@ class Organization extends Model {
 
       for (const organization of allSubscribedOrganizations) {
         if (!USE_SIMULATOR) {
+          // Subscribe-first, then check sync status.  Without subscribing,
+          // getDataLayerStoreSyncStatus errors/returns falsy for any store
+          // the DL node has no record of (e.g. after a datalayer DB reset),
+          // we skip, and no subsequent run ever subscribes — a permanent
+          // skip loop.  subscribeToStoreOnDataLayer returns falsy on the
+          // common failure paths (datalayer unreachable, getSubscriptions
+          // RPC failure) and also throws on unexpected errors, so guard on
+          // both.  Same pattern as Governance.sync and reconcileOrganization.
+          try {
+            const subscribed = await datalayer.subscribeToStoreOnDataLayer(
+              organization.orgUid,
+            );
+            if (!subscribed) {
+              logger.warn(
+                `[v1]: syncOrganizationMeta: could not subscribe to org store ${organization.orgUid}. Skipping this run.`,
+              );
+              continue;
+            }
+          } catch (error) {
+            logger.warn(
+              `[v1]: syncOrganizationMeta: could not subscribe to org store ${organization.orgUid}: ${error.message}. Skipping this run.`,
+            );
+            continue;
+          }
+
           try {
             const syncStatus = await getDataLayerStoreSyncStatus(organization.orgUid);
             if (!isDlStoreSynced(syncStatus?.sync_status)) {
diff --git a/src/models/v2/organizations-v2.model.js b/src/models/v2/organizations-v2.model.js
@@ -2086,6 +2086,31 @@ class OrganizationsV2 extends Model {
 
       for (const organization of allSubscribedOrganizations) {
         if (!USE_SIMULATOR) {
+          // Subscribe-first, then check sync status.  Without subscribing,
+          // getDataLayerStoreSyncStatus errors/returns falsy for any store
+          // the DL node has no record of (e.g. after a datalayer DB reset),
+          // we skip, and no subsequent run ever subscribes — a permanent
+          // skip loop.  subscribeToStoreOnDataLayer returns falsy on the
+          // common failure paths (datalayer unreachable, getSubscriptions
+          // RPC failure) and also throws on unexpected errors, so guard on
+          // both.  Same pattern as GovernanceV2.sync and reconcileOrganization.
+          try {
+            const subscribed = await datalayer.subscribeToStoreOnDataLayer(
+              organization.org_uid,
+            );
+            if (!subscribed) {
+              loggerV2.warn(
+                `[v2]: syncOrganizationMeta: could not subscribe to org store ${organization.org_uid}. Skipping this run.`,
+              );
+              continue;
+            }
+          } catch (error) {
+            loggerV2.warn(
+              `[v2]: syncOrganizationMeta: could not subscribe to org store ${organization.org_uid}: ${error.message}. Skipping this run.`,
+            );
+            continue;
+          }
+
           try {
             const syncStatus = await datalayer.getDataLayerStoreSyncStatus(organization.org_uid);
             if (!isDlStoreSynced(syncStatus?.sync_status)) {
