Fb/concurrency polish (#51)

* increase default concurrency for cds and service-manager from 5 to 10 * add user level control for cds and hdi concurrency with env variables
cap-js-community · Dec 21, 2023 · 2401228 · 2401228
1 parent 20a95a9
commit 2401228
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/src/shared/static.js b/src/shared/static.js
@@ -15,6 +15,8 @@ const ENV = Object.freeze({
   HDI_APP: "MTX_HDI_APP",
   SERVER_APP: "MTX_SRV_APP",
   APP_SUFFIX: "MTX_APP_SUFFIX",
+  CDS_CONCURRENCY: "MTX_CDS_CONCURRENCY",
+  HDI_CONCURRENCY: "MTX_HDI_CONCURRENCY",
 });
 
 const isUUID = (input) =>

diff --git a/src/submodules/capMultitenancy.js b/src/submodules/capMultitenancy.js
@@ -3,6 +3,7 @@
 const { promisify } = require("util");
 const { writeFile } = require("fs");
 const {
+  ENV,
   isUUID,
   isDashedWord,
   sleep,
@@ -16,11 +17,14 @@ const {
 const { assert, assertAll } = require("../shared/error");
 const { request, requestTry } = require("../shared/request");
 
-const writeFileAsync = promisify(writeFile);
 const POLL_FREQUENCY = 15000;
 const CDS_UPGRADE_APP_INSTANCE = 0;
-const CDS_OFFBOARD_CONCURRENCY = 5;
-const CDS_UPGRADE_TASK_STATUS_CONCURRENCY = 5;
+const CDS_REQUEST_CONCURRENCY_FALLBACK = 10;
+
+const writeFileAsync = promisify(writeFile);
+const cdsRequestConcurrency = process.env[ENV.CDS_CONCURRENCY]
+  ? parseInt(process.env[ENV.CDS_CONCURRENCY])
+  : CDS_REQUEST_CONCURRENCY_FALLBACK;
 
 const _isMtxs = async (context) => {
   if (_isMtxs._result === undefined) {
@@ -189,25 +193,21 @@ const _cdsUpgrade = async (
         assert(tenants, "no tenants found in response for upgrade\n%j", upgradeResponseData);
         let allSuccess = true;
         const table = [["tenantId", "status", "message"]].concat(
-          await limiter(
-            CDS_UPGRADE_TASK_STATUS_CONCURRENCY,
-            Object.entries(tenants),
-            async ([tenantId, { ID: taskId }]) => {
-              const pollTaskResponse = await requestTry({
-                checkStatus: false,
-                url: cfRouteUrl,
-                pathname: `/-/cds/jobs/pollTask(ID='${taskId}')`,
-                auth: { token: await context.getCachedUaaToken() },
-                headers: {
-                  "X-Cf-App-Instance": `${cfAppGuid}:${appInstance}`,
-                },
-              });
-              const pollTaskResponseData = await _safeMaterializeJson(pollTaskResponse, "poll task");
-              const { status, error } = pollTaskResponseData || {};
-              allSuccess &= status && !error;
-              return [tenantId, status, error || ""];
-            }
-          )
+          await limiter(cdsRequestConcurrency, Object.entries(tenants), async ([tenantId, { ID: taskId }]) => {
+            const pollTaskResponse = await requestTry({
+              checkStatus: false,
+              url: cfRouteUrl,
+              pathname: `/-/cds/jobs/pollTask(ID='${taskId}')`,
+              auth: { token: await context.getCachedUaaToken() },
+              headers: {
+                "X-Cf-App-Instance": `${cfAppGuid}:${appInstance}`,
+              },
+            });
+            const pollTaskResponseData = await _safeMaterializeJson(pollTaskResponse, "poll task");
+            const { status, error } = pollTaskResponseData || {};
+            allSuccess &= status && !error;
+            return [tenantId, status, error || ""];
+          })
         );
         console.log(tableList(table) + "\n");
         assert(allSuccess, "upgrade tenant failed");
@@ -296,7 +296,7 @@ const cdsOffboardTenant = async (context, [tenantId]) => {
 const cdsOffboardAll = async (context) => {
   const tenants = await _cdsTenants(context);
   await limiter(
-    CDS_OFFBOARD_CONCURRENCY,
+    cdsRequestConcurrency,
     tenants,
     async ({ subscribedTenantId }) => await _cdsOffboard(context, subscribedTenantId)
   );

diff --git a/src/submodules/hanaManagement.js b/src/submodules/hanaManagement.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const {
+  ENV,
   tableList,
   isPortFree,
   formatTimestampsWithRelativeDays,
@@ -15,10 +16,14 @@ const { request } = require("../shared/request");
 
 const TUNNEL_LOCAL_PORT = 30015;
 const HIDDEN_PASSWORD_TEXT = "*** show with --reveal ***";
-const SERVICE_MANAGER_CONCURRENCY = 5;
+const SERVICE_MANAGER_REQUEST_CONCURRENCY_FALLBACK = 10;
 const SERVICE_MANAGER_IDEAL_BINDING_COUNT = 1;
 const SENSITIVE_CREDENTIAL_FIELDS = ["password", "hdi_password"];
 
+const hdiRequestConcurrency = process.env[ENV.HDI_CONCURRENCY]
+  ? parseInt(process.env[ENV.HDI_CONCURRENCY])
+  : SERVICE_MANAGER_REQUEST_CONCURRENCY_FALLBACK;
+
 const isValidTenantId = (input) => input && /^[0-9a-z-_/]+$/i.test(input);
 
 const compareForInstanceManagerTenantId = compareFor((a) => a.tenant_id.toUpperCase());
@@ -246,7 +251,7 @@ const _hdiRebindAllServiceManager = async (context, parameters) => {
   console.log("rebinding tenants %s", tenantIds.join(", "));
 
   await limiter(
-    SERVICE_MANAGER_CONCURRENCY,
+    hdiRequestConcurrency,
     bindings,
     async (binding) => await _hdiRebindBindingServiceManager(sm_url, token, binding, { parameters })
   );
@@ -298,7 +303,7 @@ const _hdiRepairBindingsServiceManager = async (context, parameters) => {
     }
   }
 
-  await limiter(SERVICE_MANAGER_CONCURRENCY, changes, async (fn) => await fn());
+  await limiter(hdiRequestConcurrency, changes, async (fn) => await fn());
   changes.length === 0 && console.log("found exactly one binding for %i instances, all is well", instances.length);
 };