backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

return whole updated status_info dict from ServiceRegistry.heartbeat()

Browse Source
This commit is contained in:
Noah Levitt 2015-10-31 00:33:06 +00:00
parent 97453ae66c
commit 46a54357ad
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rethinkstuff/__init__.py
View File

@ -135,11 +135,9 @@ class ServiceRegistry(object):
status_info['last_heartbeat'] = r.now() status_info['last_heartbeat'] = r.now()
if not 'host' in status_info: if not 'host' in status_info:
status_info['host'] = socket.gethostname() status_info['host'] = socket.gethostname()
result = self.r.table('services').insert(status_info, conflict='replace').run() result = self.r.table('services').insert(status_info, conflict='replace', return_changes=True).run()
if 'generated_keys' in result: # XXX check
return result['generated_keys'][0] return result['changes'][0]['new_val']
else:
return status_info['id']
def unregister(self, id): def unregister(self, id):
result = self.r.table('services').get(id).delete().run() result = self.r.table('services').get(id).delete().run()

4
tests/run-tests.sh
View File

@ -14,6 +14,6 @@ do
&& sudo -u $user bash -x -c 'cd /rethinkstuff \ && sudo -u $user bash -x -c 'cd /rethinkstuff \
&& virtualenv -p $python /tmp/venv \ && virtualenv -p $python /tmp/venv \
&& source /tmp/venv/bin/activate \ && source /tmp/venv/bin/activate \
&& pip install pytest . \ && PYTHONDONTWRITEBYTECODE=1 pip install pytest . \
&& py.test -v -s tests'" && PYTHONDONTWRITEBYTECODE=1 py.test -v -s tests'"
done done

26
tests/test_rethinker.py
View File

@ -6,6 +6,7 @@ import gc
import pytest import pytest
import rethinkdb import rethinkdb
import time import time
import socket
logging.basicConfig(stream=sys.stderr, level=logging.INFO, logging.basicConfig(stream=sys.stderr, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s") format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")
@ -90,7 +91,7 @@ def test_slice(r, my_table):
assert not r.last_conn.is_open() assert not r.last_conn.is_open()
assert n == 5 assert n == 5
def test_svcreg(r): def test_service_registry(r):
# import pdb; pdb.set_trace() # import pdb; pdb.set_trace()
svcreg = rethinkstuff.ServiceRegistry(r) svcreg = rethinkstuff.ServiceRegistry(r)
assert svcreg.available_service("yes-such-role") == None assert svcreg.available_service("yes-such-role") == None
@ -104,30 +105,37 @@ def test_svcreg(r):
"load": 200.0, "load": 200.0,
"heartbeat_interval": 0.2, "heartbeat_interval": 0.2,
} }
svc0["id"] = svcreg.heartbeat(svc0) svc0 = svcreg.heartbeat(svc0)
svc1["id"] = svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
assert svc0["id"] is not None assert "id" in svc0
assert svc1["id"] is not None assert "id" in svc1
assert svc0["id"] != svc1["id"] assert svc0["id"] != svc1["id"]
assert svc0["host"] == socket.gethostname()
assert svc1["host"] == socket.gethostname()
assert "last_heartbeat" in svc0
assert "last_heartbeat" in svc1
time.sleep(0.1) time.sleep(0.1)
assert svcreg.available_service("no-such-role") == None assert svcreg.available_service("no-such-role") == None
assert svcreg.available_service("yes-such-role")["id"] == svc0["id"] assert svcreg.available_service("yes-such-role")["id"] == svc0["id"]
svc1["load"] = 50.0 svc1["load"] = 50.0
svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
time.sleep(0.1) time.sleep(0.1)
assert svcreg.available_service("no-such-role") == None assert svcreg.available_service("no-such-role") == None
assert svcreg.available_service("yes-such-role")["id"] == svc1["id"] assert svcreg.available_service("yes-such-role")["id"] == svc1["id"]
svc1["load"] = 200.0 svc1["load"] = 200.0
svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
time.sleep(0.1) time.sleep(0.1)
assert svcreg.available_service("no-such-role") == None assert svcreg.available_service("no-such-role") == None
assert svcreg.available_service("yes-such-role")["id"] == svc0["id"] assert svcreg.available_service("yes-such-role")["id"] == svc0["id"]
svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
time.sleep(0.1) time.sleep(0.1)
svcreg.heartbeat(svc1) svc1 = svcreg.heartbeat(svc1)
time.sleep(0.4) time.sleep(0.4)
assert svcreg.available_service("no-such-role") == None assert svcreg.available_service("no-such-role") == None
assert svcreg.available_service("yes-such-role")["id"] == svc1["id"] assert svcreg.available_service("yes-such-role")["id"] == svc1["id"]