Skip to content

Misc fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Misc fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8b8767
Enable keyfile/certfile for communication with dispyscheduler.
cajosc Nov 18, 2014
6037c3f
Allow PING messages from dispyscheduler.
cajosc Nov 18, 2014
8d114ef
Use uuid.uuid4().hex as _job.uid instead of memory address.
cajosc Nov 18, 2014
138a2df
Change main loop to sleep(60).
cajosc Nov 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dispy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,8 +1865,8 @@ def _terminate_scheduler(self, coro=None):
if not ext_ip_addr:
break

sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock = AsyncSocket(sock, blocking=True)
sock = AsyncSocket(socket.socket(socket.AF_INET, socket.SOCK_STREAM), blocking=True,
keyfile=self.keyfile, certfile=self.certfile)
sock.connect((self.scheduler_ip_addr, scheduler_port))
sock.sendall(self._cluster.auth_code)
sock.send_msg('CLIENT:' + serialize({'version':_dispy_version, 'ip_addr':ext_ip_addr,
Expand Down
2 changes: 1 addition & 1 deletion dispynode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def send_pong_msg(self, addr, auth_code, coro=None):
# TODO: process each message as separate Coro, so
# exceptions are contained?
if msg.startswith('PING:'):
if self.num_cpus != self.avail_cpus or self.scheduler['ip'] != None:
if self.num_cpus != self.avail_cpus:
logger.debug('Busy (%s/%s); ignoring ping message from %s:%s',
self.num_cpus, self.avail_cpus, addr[0], addr[1])
continue
Expand Down
5 changes: 3 additions & 2 deletions dispyscheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import traceback
import tempfile
import cPickle as pickle
import uuid

from dispy import _Compute, DispyJob, _DispyJob_, _Node, _JobReply, \
num_min, _parse_nodes, _node_ipaddr, _XferFile, _dispy_version
Expand Down Expand Up @@ -615,7 +616,7 @@ def _job_request_task(self, msg):
except:
logger.debug('Ignoring job request from %s', addr[0])
return
_job.uid = id(_job)
_job.uid = uuid.uuid4().hex
setattr(_job, 'node', None)
job = type('DispyJob', (), {'status':DispyJob.Created,
'start_time':None, 'end_time':None})
Expand Down Expand Up @@ -1392,7 +1393,7 @@ def cleanup_computation(self, cluster):
scheduler = _Scheduler(**config)
while True:
try:
sys.stdin.readline()
time.sleep(60)
except KeyboardInterrupt:
# TODO: terminate even if jobs are scheduled?
logger.info('Interrupted; terminating')
Expand Down