Author: tmckay
Date: 2013-02-18 17:52:26 +0000 (Mon, 18 Feb 2013)
New Revision: 5716
Modified:
branches/tmckay/mint/python/mint/aviary/endpoints.py
branches/tmckay/sage/python/sage/aviary/aviaryoperations.py
Log:
Fix up collector endpoint resource types
Modified: branches/tmckay/mint/python/mint/aviary/endpoints.py
===================================================================
--- branches/tmckay/mint/python/mint/aviary/endpoints.py 2013-02-18 16:14:23 UTC (rev
5715)
+++ branches/tmckay/mint/python/mint/aviary/endpoints.py 2013-02-18 17:52:26 UTC (rev
5716)
@@ -115,7 +115,7 @@
self.type_map = \
{("CUSTOM","QUERY_SERVER"):
self._make_submission_endpoint,
- ("COLLECTOR", ""): self._make_collector_endpoint}
+ ("COLLECTOR", "POOL"): self._make_collector_endpoint}
def get_endpoint_types(self):
# This routine maps Rosemary class names to Aviary
@@ -123,11 +123,11 @@
# what types of endpoints to report
classes_to_aviary = \
- {"Collector": ("COLLECTOR", ""),
- "Negotiator": ("COLLECTOR", ""),
- "Scheduler": ("COLLECTOR", ""),
- "Submitter": ("COLLECTOR", ""),
- "Slot": ("COLLECTOR", ""),
+ {"Collector": ("COLLECTOR", "POOL"),
+ "Negotiator": ("COLLECTOR", "POOL"),
+ "Scheduler": ("COLLECTOR", "POOL"),
+ "Submitter": ("COLLECTOR", "POOL"),
+ "Slot": ("COLLECTOR", "POOL"),
"Submission": ("CUSTOM", "QUERY_SERVER")}
endpoints = set()
Modified: branches/tmckay/sage/python/sage/aviary/aviaryoperations.py
===================================================================
--- branches/tmckay/sage/python/sage/aviary/aviaryoperations.py 2013-02-18 16:14:23 UTC
(rev 5715)
+++ branches/tmckay/sage/python/sage/aviary/aviaryoperations.py 2013-02-18 17:52:26 UTC
(rev 5716)
@@ -77,7 +77,7 @@
_nice = {("SCHEDULER","JOB"): "job service",
("CUSTOM","QUERY_SERVER"): "query service",
("SCHEDULER","HADOOP"): "hadoop service",
- ("COLLECTOR",""): "collector service"}
+ ("COLLECTOR","POOL"): "collector service"}
def __init__(self, resource, subtype):
self.servers = None
@@ -1259,7 +1259,7 @@
"9000",
"/services/collector/",
"COLLECTOR",
- "")
+ "POOL")
# Equivalence? We don't want no stinking QMF structural equivalence!
self.use_MethodResult_for_sync_calls = False
@@ -1448,9 +1448,8 @@
datadir, hadoop_servers))
if collector_servers:
- # we never use locator for collector (for now)
- self.mechs.append(_AviaryCollectorMethods(None,
- transports,
+ self.mechs.append(_AviaryCollectorMethods(self.locator,
+ transports,
datadir, collector_servers))
self.add_mechanisms(self.mechs)
@@ -1467,8 +1466,7 @@
# id location
# [ ( (name,pool,resource,sub_type), [full urls] ) ]
- # For now collector never uses locator
- if self.locator and resource != "COLLECTOR":
+ if self.locator:
ep = self.locator.get_endpoints(resource, subtype)
if ep.status.code in ("OK", "NO_MATCH"):
if hasattr(ep, "resources"):