INT-11156: wrap in try/catch timeout

src/configuration-manager/client.ts

@@ -119,8 +119,6 @@ class MicrosoftConfigurationManagerClient {
 
         const records = result.recordset;
 
-        logger.info(`Proccesed ${records.length} records from query`);
-
         if (records.length > 0) {
           await pMap(
             records,
@@ -175,37 +173,42 @@ class MicrosoftConfigurationManagerClient {
   async listCollectionSubscriptions<T>(
     tableName: string,
     iteratee: ResourceIteratee<T>,
+    logger: IntegrationLogger,
     pageSize: number = 200,
   ) {
     let offset = 0;
     let hasMoreRecords = true;
 
-    while (hasMoreRecords) {
-      const query = buildCollectionSubscriptionQuery(
-        this.dbName,
-        tableName,
-        offset,
-        pageSize,
-      );
-      const result = await this.wrapWithRequestFailedHandler(() =>
-        this.connection.query(query),
-      );
-
-      const records = result.recordset;
-      if (records.length > 0) {
-        await pMap(
-          records,
-          async (record) => {
-            await iteratee(record);
-          },
-          {
-            concurrency: 2,
-          },
+    try {
+      while (hasMoreRecords) {
+        const query = buildCollectionSubscriptionQuery(
+          this.dbName,
+          tableName,
+          offset,
+          pageSize,
         );
-        offset += pageSize;
-      } else {
-        hasMoreRecords = false;
+        const result = await this.wrapWithRequestFailedHandler(() =>
+          this.connection.query(query),
+        );
+
+        const records = result.recordset;
+        if (records.length > 0) {
+          await pMap(
+            records,
+            async (record) => {
+              await iteratee(record);
+            },
+            {
+              concurrency: 2,
+            },
+          );
+          offset += pageSize;
+        } else {
+          hasMoreRecords = false;
+        }
       }
+    } catch (err) {
+      logger.info(`Received SQL error when processing query: ${err}`);
     }
   }
 

src/steps/collections/index.ts

@@ -27,7 +27,12 @@ export const fetchCollectionsSteps: IntegrationStep<IntegrationConfig>[] = [
     name: 'Build Collection Relationships',
     entities: [],
     relationships: [Relationships.COLLECTION_HAS_DEVICE],
-    dependsOn: [Steps.FETCH_COLLECTIONS, Steps.FETCH_DEVICES],
+    dependsOn: [
+      Steps.FETCH_COLLECTIONS,
+      Steps.FETCH_DEVICES,
+      // INT-11156: this kind of hacky, but we need to await until this steps finishes to avoid overloading the server
+      Steps.BUILD_APPLICATION_RELATIONSHIPS,
+    ],
     executionHandler: buildCollectionsRelationships,
   },
 ];
@@ -80,6 +85,7 @@ export async function buildCollectionsRelationships({
               );
             }
           },
+          logger,
         );
       }
     },