[ARVADOS] updated: 1f8d81d0eeda07c3cedcaad3e942ec8dedd461cb
git at public.curoverse.com
git at public.curoverse.com
Mon Oct 5 21:31:06 EDT 2015
Summary of changes:
services/nodemanager/arvnodeman/computenode/__init__.py | 7 +++++++
services/nodemanager/arvnodeman/computenode/driver/azure.py | 2 ++
services/nodemanager/setup.py | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
via 1f8d81d0eeda07c3cedcaad3e942ec8dedd461cb (commit)
from d5f5f869d46f9096c7c680d608c1cc654d1d7fa0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 1f8d81d0eeda07c3cedcaad3e942ec8dedd461cb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Oct 5 21:33:00 2015 -0400
7286: Add comments clarifying arvados_node_missing() and broken(). Also bump
up version dependency to dev4.
diff --git a/services/nodemanager/arvnodeman/computenode/__init__.py b/services/nodemanager/arvnodeman/computenode/__init__.py
index e7bd7bf..6e46bc0 100644
--- a/services/nodemanager/arvnodeman/computenode/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/__init__.py
@@ -31,6 +31,13 @@ def timestamp_fresh(timestamp, fresh_time):
return (time.time() - timestamp) < fresh_time
def arvados_node_missing(arvados_node, fresh_time):
+ """Indicate if cloud node corresponding to the arvados
+ node is "missing".
+
+ If True, this means the node has not pinged the API server within the timeout
+ period. If False, the ping is up to date. If the node has never pinged,
+ returns None.
+ """
if arvados_node["last_ping_at"] is None:
return None
else:
diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index ca6ed7c..b1ec5e6 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/azure.py
@@ -84,6 +84,8 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
def broken(self, cloud_node):
"""Return true if libcloud has indicated the node is in a "broken" state."""
+ # UNKNOWN means the node state is unrecognized, which in practice means some combination
+ # of failure that the Azure libcloud driver doesn't know how to interpret.
return (cloud_node.state in (cloud_types.NodeState.ERROR, cloud_types.NodeState.UNKNOWN))
@classmethod
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index e7dcec9..e74fb8e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -31,11 +31,11 @@ setup(name='arvados-node-manager',
'python-daemon',
],
dependency_links = [
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev3.zip"
+ "https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev4.zip"
],
scripts=['bin/arvados-node-manager'],
test_suite='tests',
- tests_require=['pbr<1.7.0', 'mock>=1.0', "apache-libcloud==0.18.1.dev3"],
+ tests_require=['pbr<1.7.0', 'mock>=1.0', "apache-libcloud==0.18.1.dev4"],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list