switch envs, resources are shared on multiple envs and are exclusive

.github/workflows/ci.yml

@@ -290,7 +290,7 @@ jobs:
           DB_PASSWORD: 'changeme'
           MAX_REQ_PER_MINUTE: 320
           MAX_CONNECTIONS_PER_MINUTE: 320
-          DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":10}],"storageExpiry":604800,"maxJobDuration":3600,"minJobDuration": 60,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"minJobDuration": 10,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1},{"id":"disk","max":1}]}}]'
+          DOCKER_COMPUTE_ENVIRONMENTS: '[{"socketPath":"/var/run/docker.sock","resources":[{"id":"disk","total":10}],"environments":[{"storageExpiry":604800,"maxJobDuration":3600,"minJobDuration":60,"fees":{"8996":[{"prices":[{"id":"cpu","price":1}]}]},"free":{"maxJobDuration":60,"maxJobs":3,"resources":[{"id":"cpu","max":1},{"id":"ram","max":1},{"id":"disk","max":1}]}}]}]'
           DOCKER_REGISTRY_AUTHS: ${{ env.DOCKER_REGISTRY_AUTHS }}
       - name: Check Ocean Node is running
         run: |

config.json

@@ -102,48 +102,47 @@
           "total": 1
         }
       ],
-      "storageExpiry": 604800,
-      "maxJobDuration": 3600,
-      "minJobDuration": 60,
-      "access": {
-        "addresses": [],
-        "accessLists": []
-      },
-      "fees": {
-        "8996": [
-          {
-            "prices": [
+      "environments": [
+        {
+          "storageExpiry": 604800,
+          "maxJobDuration": 3600,
+          "minJobDuration": 60,
+          "access": {
+            "addresses": [],
+            "accessLists": []
+          },
+          "fees": {
+            "8996": [
               {
-                "id": "cpu",
-                "price": 1
+                "prices": [
+                  {
+                    "id": "cpu",
+                    "price": 1
+                  }
+                ]
               }
             ]
-          }
-        ]
-      },
-      "free": {
-        "maxJobDuration": 3600,
-        "minJobDuration": 60,
-        "maxJobs": 3,
-        "access": {
-          "addresses": [],
-          "accessLists": []
-        },
-        "resources": [
-          {
-            "id": "cpu",
-            "max": 1
-          },
-          {
-            "id": "ram",
-            "max": 1
           },
-          {
-            "id": "disk",
-            "max": 1
+          "free": {
+            "maxJobDuration": 3600,
+            "maxJobs": 3,
+            "resources": [
+              {
+                "id": "cpu",
+                "max": 1
+              },
+              {
+                "id": "ram",
+                "max": 1
+              },
+              {
+                "id": "disk",
+                "max": 1
+              }
+            ]
           }
-        ]
-      }
+        }
+      ]
     }
   ]
 }

src/@types/C2D/C2D.ts

@@ -139,6 +139,19 @@ export interface ComputeEnvironment extends ComputeEnvironmentBaseConfig {
   runMaxWaitTimeFree: number
 }
 
+export interface C2DEnvironmentConfig {
+  id?: string
+  description?: string
+  storageExpiry?: number
+  minJobDuration?: number
+  maxJobDuration?: number
+  maxJobs?: number
+  fees?: ComputeEnvFeesStructure
+  access?: ComputeAccessList
+  free?: ComputeEnvironmentFreeOptions
+  resources?: string[]
+}
+
 export interface C2DDockerConfig {
   socketPath: string
   protocol: string
@@ -147,17 +160,11 @@ export interface C2DDockerConfig {
   caPath: string
   certPath: string
   keyPath: string
-  storageExpiry?: number
-  maxJobDuration?: number
-  minJobDuration?: number
-  maxJobs?: number
-  fees: ComputeEnvFeesStructure
-  resources?: ComputeResource[] // optional, owner can overwrite
-  free?: ComputeEnvironmentFreeOptions
-  access: ComputeAccessList
+  resources?: ComputeResource[]
   imageRetentionDays?: number // Default: 7 days
   imageCleanupInterval?: number // Default: 86400 seconds (24 hours)
-  paymentClaimInterval?: number // Default: 3600 seconds (1 hours)
+  paymentClaimInterval?: number // Default: 3600 seconds (1 hour)
+  environments: C2DEnvironmentConfig[]
 }
 
 export type ComputeResultType =

src/components/c2d/compute_engine_base.ts

@@ -316,6 +316,9 @@ export abstract class C2DEngine {
     } catch (e) {
       CORE_LOGGER.error('Failed to get running jobs:' + e.message)
     }
+
+    const envResourceIds = new Set((env.resources || []).map((r) => r.id))
+
     let totalJobs = 0
     let totalFreeJobs = 0
     let queuedJobs = 0
@@ -324,9 +327,13 @@ export abstract class C2DEngine {
     let maxWaitTimeFree = 0
     let maxRunningTime = 0
     let maxRunningTimeFree = 0
+
     for (const job of jobs) {
-      if (job.environment === env.id) {
-        if (job.queueMaxWaitTime === 0) {
+      const isThisEnv = job.environment === env.id
+      const isRunning = job.queueMaxWaitTime === 0
+
+      if (isThisEnv) {
+        if (isRunning) {
           const timeElapsed =
             new Date().getTime() / 1000 - Number.parseFloat(job?.algoStartTimestamp)
           totalJobs++
@@ -335,23 +342,27 @@ export abstract class C2DEngine {
             totalFreeJobs++
             maxRunningTimeFree += job.maxJobDuration - timeElapsed
           }
+        } else {
+          queuedJobs++
+          maxWaitTime += job.maxJobDuration
+          if (job.isFree) {
+            queuedFreeJobs++
+            maxWaitTimeFree += job.maxJobDuration
+          }
+        }
+      }
 
-          for (const resource of job.resources) {
+      // Resource usage is checked on ALL envs
+      if (isRunning) {
+        for (const resource of job.resources) {
+          if (envResourceIds.has(resource.id)) {
             if (!(resource.id in usedResources)) usedResources[resource.id] = 0
             usedResources[resource.id] += resource.amount
             if (job.isFree) {
               if (!(resource.id in usedFreeResources)) usedFreeResources[resource.id] = 0
               usedFreeResources[resource.id] += resource.amount
             }
           }
-        } else {
-          // queued job
-          queuedJobs++
-          maxWaitTime += job.maxJobDuration
-          if (job.isFree) {
-            queuedFreeJobs++
-            maxWaitTimeFree += job.maxJobDuration
-          }
         }
       }
     }