Merge branch 'minimize-zmq-threads' into 'master'

[fix] Resolve open files leaks

See merge request !57

.gitlab-ci.yml

-include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/binary_rename.yml'
+include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/basic.yml'
 
 stages:
   - style

default.nix

@@ -3,5 +3,5 @@ let argotest =
   "https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz";
 in import "${argotest}/test.nix" {
   nrm-override = ./.;
-  testName = "split";
+  testName = "base";
 }

nrm/containers.py

@@ -248,7 +248,7 @@ class DummyRuntime(ContainerRuntime):
 
     def execute(self, container_uuid, args, environ):
         import tornado.process as process
-        return process.Subprocess(args, stdin=process.Subprocess.STREAM,
+        return process.Subprocess(args,
                                   stdout=process.Subprocess.STREAM,
                                   stderr=process.Subprocess.STREAM,
                                   env=environ)

nrm/messaging.py

@@ -162,7 +162,7 @@ class UpstreamRPCClient(object):
     def __init__(self, address):
         self.address = address
         self.uuid = str(uuid.uuid4())
-        self.zmq_context = zmq.Context()
+        self.zmq_context = zmq.Context.instance()
         self.socket = self.zmq_context.socket(zmq.DEALER)
         self.socket.setsockopt(zmq.IDENTITY, self.uuid)
         self.socket.connect(address)
@@ -195,7 +195,7 @@ class UpstreamRPCServer(object):
 
     def __init__(self, address):
         self.address = address
-        self.zmq_context = zmq.Context()
+        self.zmq_context = zmq.Context.instance()
         self.socket = self.zmq_context.socket(zmq.ROUTER)
         self.socket.bind(address)
 
@@ -234,7 +234,7 @@ class UpstreamPubServer(object):
 
     def __init__(self, address):
         self.address = address
-        self.zmq_context = zmq.Context()
+        self.zmq_context = zmq.Context.instance()
         self.socket = self.zmq_context.socket(zmq.PUB)
         self.socket.setsockopt(zmq.LINGER, 0)
         self.socket.bind(address)
@@ -251,7 +251,7 @@ class UpstreamPubClient(object):
 
     def __init__(self, address):
         self.address = address
-        self.zmq_context = zmq.Context()
+        self.zmq_context = zmq.Context.instance()
         self.socket = self.zmq_context.socket(zmq.SUB)
         self.socket.setsockopt(zmq.SUBSCRIBE, '')
         self.socket.connect(address)

nrm/subprograms.py

@@ -118,7 +118,7 @@ class NodeOSClient(object):
                for envname, envval in environ.items()]
         cmd += " env:'"+" ".join(env)+"'"
         args.append(cmd)
-        return process.Subprocess(args, stdin=process.Subprocess.STREAM,
+        return process.Subprocess(args,
                                   stdout=process.Subprocess.STREAM,
                                   stderr=process.Subprocess.STREAM)