Author: tmckay
Date: 2013-01-18 22:24:28 +0000 (Fri, 18 Jan 2013)
New Revision: 5660
Modified:
branches/tmckay/cumin/bin/cumin-data
branches/tmckay/cumin/etc/cumin.conf
branches/tmckay/cumin/python/cumin/config.py
branches/tmckay/mint/python/mint/main.py
branches/tmckay/sage/python/sage/aviary/aviaryoperations.py
Log:
Add aviary-collector-servers config
Modified: branches/tmckay/cumin/bin/cumin-data
===================================================================
--- branches/tmckay/cumin/bin/cumin-data 2013-01-18 21:52:28 UTC (rev 5659)
+++ branches/tmckay/cumin/bin/cumin-data 2013-01-18 22:24:28 UTC (rev 5660)
@@ -42,6 +42,7 @@
mint.sasl_mech_list = values.sasl_mech_list.upper()
mint.aviary_query_servers = values.aviary_query_servers
+ mint.aviary_collector_servers = values.aviary_collector_servers
mint.aviary_locator = values.aviary_locator
mint.aviary_key = values.aviary_key
mint.aviary_cert = values.aviary_cert
Modified: branches/tmckay/cumin/etc/cumin.conf
===================================================================
--- branches/tmckay/cumin/etc/cumin.conf 2013-01-18 21:52:28 UTC (rev 5659)
+++ branches/tmckay/cumin/etc/cumin.conf 2013-01-18 22:24:28 UTC (rev 5660)
@@ -36,6 +36,11 @@
# Default is shown.
# aviary-query-servers:
http://localhost:9091
+# The value for this parameter is a comma separated list of URLs for Aviary
+# collector servers. If the Aviary locator is used, this value will be overriden.
+# Default is shown.
+# aviary-collector-servers:
http://localhost:9000
+
# The locator allows Cumin to retrie ve values for Aviary job servers and
# Aviary query servers automatically. If the Aviary locator is enabled the
# values for aviary-job-servers and aviary-query-servers will be overriden.
Modified: branches/tmckay/cumin/python/cumin/config.py
===================================================================
--- branches/tmckay/cumin/python/cumin/config.py 2013-01-18 21:52:28 UTC (rev 5659)
+++ branches/tmckay/cumin/python/cumin/config.py 2013-01-18 22:24:28 UTC (rev 5660)
@@ -99,7 +99,7 @@
def __init__(self, section_name="data", strict_section=False):
super(CuminDataConfig, self).__init__(section_name)
- data = BrokeredConfigSection(self, self.section_name, strict_section)
+ data = CuminDataConfigSection(self, self.section_name, strict_section)
_common_data_section(self, data, self.section_name)
class CuminReportConfig(CuminConfig):
@@ -206,6 +206,14 @@
param = ConfigParameter(self, "aviary-prefer-condor", bool)
param.default = True
+class CuminDataConfigSection(BrokeredConfigSection):
+ def __init__(self, config, name, strict_section=False):
+ super(CuminDataConfigSection, self).__init__(config, name,
+ strict_section)
+ # data uses the collector service, too
+ param = ConfigParameter(self, "aviary-collector-servers", str)
+ param.default = "http://localhost:9000"
+
class CuminWebConfigSection(BrokeredConfigSection):
def __init__(self, config, name, strict_section=False):
super(CuminWebConfigSection, self).__init__(config, name,
Modified: branches/tmckay/mint/python/mint/main.py
===================================================================
--- branches/tmckay/mint/python/mint/main.py 2013-01-18 21:52:28 UTC (rev 5659)
+++ branches/tmckay/mint/python/mint/main.py 2013-01-18 22:24:28 UTC (rev 5660)
@@ -53,6 +53,7 @@
# Aviary interface.
self.aviary_query_servers = ""
+ self.aviary_collector_servers = ""
self.aviary_key = ""
self.aviary_cert = ""
self.aviary_root_cert = ""
@@ -123,6 +124,7 @@
None, # we don't care about job_servers
self.aviary_query_servers,
None, # or hadoop servers
+ self.aviary_collector_servers,
key=self.aviary_key,
cert=self.aviary_cert,
root_cert=self.aviary_root_cert,
@@ -136,12 +138,16 @@
log.info("%s Aviary locator interface" % \
((self.aviary_locator and \
- (self.aviary_query_servers) and \
+ (self.aviary_query_servers or \
+ self.aviary_collector_servers) and \
imports_ok) and "Enabled" or "Disabled"))
log.info("%s Aviary interface for query operations." % \
((self.aviary_query_servers and imports_ok) and "Enabled" or
"Disabled"))
+ log.info("%s Aviary interface for collector operations." % \
+ ((self.aviary_collector_servers and imports_ok) and "Enabled"
or "Disabled"))
+
def init(self):
log.info("Initializing %s", self)
Modified: branches/tmckay/sage/python/sage/aviary/aviaryoperations.py
===================================================================
--- branches/tmckay/sage/python/sage/aviary/aviaryoperations.py 2013-01-18 21:52:28 UTC
(rev 5659)
+++ branches/tmckay/sage/python/sage/aviary/aviaryoperations.py 2013-01-18 22:24:28 UTC
(rev 5660)
@@ -1235,6 +1235,7 @@
job_servers=True,
query_servers=True,
hadoop_servers=True,
+ collector_servers=True,
key="", cert="", root_cert="",
domain_verify=True):
super(AviaryOperations, self).__init__()