dcp-worker 4.3.6 → 4.3.8

package/bin/dcp-evaluator-manager

@@ -85,6 +85,7 @@ Usage: ${process.argv[0]} [-h | --help] [--prefix=<dir>] [--pts=<dir>]
        [-s | --signal=[name or number][,<toggle|quick>]]
        [-T | --loadavg-type=<short,medium,long,random>]
        [-f | --pidfile=</path/to/file.pid>]
+       [--node=</path/to/node>]
        [-- <options to dcp-evaluator-start, must be last option>]
 Where:
  -i sets the idle timeout in seconds for tty sessions (${daemonConfig.session.idleTimeout}s)
@@ -106,6 +107,8 @@ Where:
    A value of zero disables this limit; the default value is ${daemonConfig.limits.maxLoad}.
  --loadavg-type determines how load is measured; 'short', 'medium', 'long',
                 'random'. Random generates a load between 0 and 1 (${daemonConfig.limits.loadavgType}).
+ --node is the path to the node executable to spawn dcp-evaluator-start with;
+   default value is ${process.argv[0]}.
 
  -L only apply the limits when the monitors say the machine is busy
 
@@ -265,6 +268,9 @@ function handleConnection (socket, config)
     windowsHide: true,
     maxBuffer: 1024 * 1024 * 1024 * 2,
   };
+
+  if (daemonConfig.ldLibraryPath)
+    options.env['LD_LIBRARY_PATH'] = daemonConfig.ldLibraryPath;
   Object.apply(options, daemonConfig.spawnOptions);
   child = require('child_process').spawn(config.proc, config.argv, options);
   child.stderr.setEncoding('ascii');
@@ -575,7 +581,7 @@ async function main()
        utils.getoptParse(process.argv.slice(2), ''
                          + 'h(help)P:(prefix)H:p:d:(disable-monitor)l:(max-load)r:(rate)'
                          + 'Li:as:(signal)T:(loadavg-type)f:(pidfile)n(no-pidfile)'
-                         + '*:(logfile)*(overwrite-logfile)*:(syslog)*:(min-level)'))
+                         + '*:(logfile)*(overwrite-logfile)*:(syslog)*:(min-level)*:(node)'))
   {
     switch (option)
     {
@@ -710,6 +716,12 @@ async function main()
         loggingOptions.minLevel[which] = level;
         break;
       }
+      case 'node':
+      {
+        daemonConfig.proc = optarg;
+        daemonConfig.ldLibraryPath = path.dirname(optarg);
+        break;
+      }
       case '--':
         daemonConfig.argv = daemonConfig.argv.concat(argvSegment); /* All options after -- pass to dcp-evaluator-start */
         break;

package/bin/dcp-evaluator-start

@@ -59,6 +59,7 @@ function main()
     evaluator:          path.join('bin', 'dcp-evaluator'), /* resolved against prefix later */
     verbose:            0,
   };
+  let files = [];   /* Startup files passed to evaluator as supplementary arguments */
 
   function help() {
     const binName = path.basename(__filename);
@@ -82,6 +83,8 @@ Options:
                               ${options.sandboxDefinitions}
       --sandbox-libexec-dir=  Location of sandbox setup files; default is
                               ${options.sandboxLibexecDir}
+      --additional-files=     Additional files to concat before the normal sandbox setup
+                              files. Expects absolute paths
   -D, --dump                  Dump configuration to stdout and exit
   -T, --dump-types            Dump list of known sandbox types to stdout and exit
   -F, --dump-files            Dump list of startup files which would be passed
@@ -109,7 +112,7 @@ Options:
                          + 'h(help)P:(prefix)p:(port)s(stdio)e:(evaluator)r:(rEvaluator)'
                          + '*:(sandbox-libexec-dir)*:(sandbox-definitions)t:(sandbox-type)'
                          + 'D(dump)T(dump-types)F(dump-files)J(json)v(verbose)f:(pidfile)d:(logLevel)'
-                         + '*:(logfile)*(overwrite-logfile)*:(syslog)*:(min-level)'))
+                         + '*:(logfile)*(overwrite-logfile)*:(syslog)*:(min-level)*:(additional-files)'))
   {
     switch (option)
     {
@@ -190,6 +193,11 @@ Options:
         loggingOptions.minLevel[which] = level;
         break;
       }
+      case 'additional-files':
+      {
+        files.push(optarg);
+        break;
+      }
       case '--':
         options.evaluatorOptions = argvSegment; /* after --, pass to evaluator as-is */
         break;
@@ -210,7 +218,6 @@ Options:
     panic(`Invalid sandbox type: ${options.sandboxType}`);
 
   let args = [];    /* Command-line arguments to pass to evaluator */
-  let files = [];   /* Startup files passed to evaluator as supplementary arguments */
 
   if (!options.stdio && options.port)
     args = args.concat(['-p', options.port]);

package/bin/dcp-task-probe

@@ -510,7 +510,7 @@ async function requestTask(dummyWorker, opts)
         sandbox: dummyWorker.config.maxSandboxes,
       },
       jobQuanta:            [ 1 ]/* this.quanta.calculateJobQuanta() */,
-      capabilities:         require('dcp/capabilities').toBits(dummyWorker.config.capabilities),
+      capabilities:         require('dcp/constants').scheduler.capabilities.toBits(dummyWorker.config.capabilities),
       paymentAddress:       dummyWorker.config.paymentAddress,
       jobIds:               dummyWorker.config.jobIds || [],
       minimumWage:          dummyWorker.config.minimumWage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [