dcp-worker 4.3.4 → 4.3.6

package/bin/dcp-task-probe

@@ -16,7 +16,7 @@
  *   - bank account
  * - body:
  *   - newJobs: job id props
- *     - address: job id
+ *     - jobId: job id
  *     - metrics:
  *       - sliceCPUTime
  *       - sliceGPUTime
@@ -379,7 +379,7 @@ async function processOptions(workerConfig)
         const value = parseValue(opthnd.optarg.slice(idx + 1), dcpConfig.worker);
         const [ confNode, prop ] = walkDotPath(dcpConfig.worker, opthnd.optarg.slice(0, idx));
 
-        if (opthnd.option === 's')
+        if (opthnd.option === 'S')
           confNode[prop] = value;
         else
         {
@@ -454,6 +454,7 @@ async function probeEvaluator(workerConfig)
     }
 
     workerConfig.capabilities ||= evaluatorInfo.capabilities;
+    workerConfig.capabilities.KVINv9 = true;
     workerConfig.worktimes    ||= evaluatorInfo.worktimes;
   }
 }
@@ -497,7 +498,6 @@ async function requestTask(dummyWorker, opts)
     request = readWorkerSnapshot().request;
   else
     request = {
-      supervisor: dummyWorker.supervisorVersion,
       targetLoad: {
         cpu: Math.min(dummyWorker.config.maxSandboxes, dummyWorker.config.cores.cpu * dummyWorker.config.utilization.cpu) /* cpuCoreSpace */,
         gpu: Math.min(dummyWorker.config.maxSandboxes, dummyWorker.config.cores.gpu * dummyWorker.config.utilization.gpu) /* this.maxWorkingGPUs */,
@@ -510,7 +510,7 @@ async function requestTask(dummyWorker, opts)
         sandbox: dummyWorker.config.maxSandboxes,
       },
       jobQuanta:            [ 1 ]/* this.quanta.calculateJobQuanta() */,
-      capabilities:         dummyWorker.config.capabilities,
+      capabilities:         require('dcp/capabilities').toBits(dummyWorker.config.capabilities),
       paymentAddress:       dummyWorker.config.paymentAddress,
       jobIds:               dummyWorker.config.jobIds || [],
       minimumWage:          dummyWorker.config.minimumWage,
@@ -521,6 +521,7 @@ async function requestTask(dummyWorker, opts)
       unresolvedJobs:       [],
       fetchState:           1, /* normal fetch */
       worktimes:            dummyWorker.config.worktimes,
+      seq:                  0,
     };
 
   debug('dcp-task-probe:connect')('Connecting to task distributor at', tdConn.targetDescriptor.location.href);
@@ -528,7 +529,7 @@ async function requestTask(dummyWorker, opts)
   debug('dcp-task-probe:request')('Task Request:', request);
 
   const rtStart = Date.now();
-  const tdRequest = new tdConn.Request({operation: 'requestTask', data: request});
+  const tdRequest = new tdConn.Request({operation: 'requestTask@3', data: request});
   tdRequest.connection.on('beforeSend', function beforeSendHandler (request) {
     /* need to delay hashing because connection might not be established yet, but we need the dcpsid */
     if (request !== tdRequest)
@@ -605,7 +606,10 @@ async function main()
   const initialWorkerConfig = {
     allowOrigins: {
       any: [],
-    }
+    },
+    cores: {},
+    utilization: {},
+    computeGroups: [],
   };
   const opts = await processOptions(initialWorkerConfig);
   await identity.login('$login');
@@ -618,6 +622,7 @@ async function main()
   if (!opts.replay)
     await probeEvaluator(initialWorkerConfig);
   const dummyWorker = new (require('dcp/worker').DistributiveWorker)(initialWorkerConfig, function FakeSandboxConstructor(){});
+  dummyWorker.unref();
 
   if (opts.hasOwnProperty('showConfig'))
   {
@@ -645,15 +650,11 @@ async function main()
     process.exit(22);
   }
 
-  const { newJobs, computeGroupJobs, computeGroupOrigins, schedulerConfig } = response.payload.body;
-  const cgs = {}
-  for (const cgId in computeGroupJobs)
-    cgs[cgId] = { jobCount: computeGroupJobs[cgId].length };
-  for (const jobId in newJobs)
-  {
-    for (const cg of newJobs[jobId].public.computeGroups)
-      Object.assign(cgs[cg.opaqueId], { name: cg.name, description: cg.description });
-  }
+  const { newJobs, computeGroupOrigins, schedulerConfig } = response.payload.body;
+  const cgs = new Map();
+  for (let job in newJobs)
+    for (let computeGroup of newJobs[job].public.computeGroups)
+      cgs.set(computeGroup.opaqueId, computeGroup.name);
 
   console.log('Total Jobs:          ', Object.keys(task).length);
   console.log('Total Slices:        ', Object.keys(task).map(jobId => task[jobId].length).reduce((a, b) => a+b, 0));
@@ -664,15 +665,16 @@ async function main()
               fmtMs(Object.keys(task).map(jobId => newJobs[jobId].metrics.sliceCPUTime).reduce((a, b) => a+b, 0) / workerConfig.cores.cpu) + ',',
               fmtMs(Object.keys(task).map(jobId => newJobs[jobId].metrics.sliceGPUTime).reduce((a, b) => a+b, 0) / workerConfig.cores.gpu));
   console.log('Task Duration:       ', schedulerConfig.targetTaskDuration + 's');
-  console.log('Compute Groups:      ', Object.keys(computeGroupJobs).length);
+  console.log('Compute Groups:      ', Array.from(cgs.values()).join(', '));
 
   if (opts.verbose)
   {
-    for (const cgId in cgs)
+    if (Object.keys(computeGroupOrigins).length > 0)
+      console.log('Allowed origings via compute groups: ');
+    for (const cgId in computeGroupOrigins)
     {
-      console.log(' -', cgId, cgs[cgId].name);
-      if (computeGroupOrigins[cgId])
-        console.log('   allow origins:', computeGroupOrigins[cgId]);
+      console.log(' -', cgId, cgs.get(cgId));
+      console.log('   allow origins:', computeGroupOrigins[cgId]);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -39,7 +39,7 @@
     "blessed": "0.1.81",
     "blessed-contrib": "4.11.0",
     "chalk": "4.1.2",
-    "dcp-client": "^5.4.0",
+    "dcp-client": "^5.5.0",
     "kvin": "^9.0.0",
     "posix-getopt": "1.2.1",
     "semver": "7.7.3",