Skip to content
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

Jump to bottom

M153: Multiple Broker Support (supporting changes for pyon PR) #2178

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

M153: Multiple Broker Support (supporting changes for pyon PR) #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d564f40
Remove RPC listener in TransformBase
May 5, 2014
67de5f5
Update EMS to match new ExchangeManager API
May 8, 2014
8ca6d70
Bump pyon pointer to support M153
Jun 11, 2014
843541a
Bump pyon to include ems_client fix
Jun 12, 2014
bd088be
Bumped pyon to fix typo
Jun 12, 2014
6054e03
Bump pyon for recursion fix
Jun 13, 2014
2aa77b4
Bump pyon for chicken/egg problem in ex manager startup
Jun 13, 2014
447dd7f
Bumped pyon to include XS type fix
Jun 17, 2014
ef19d23
Bump pyon to account for publisher issue
Jun 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/pyon
Open in desktop
Submodule pyon updated 11 files
+3 −4 pyon/container/cc.py
+16 −26 pyon/container/procs.py
+25 −0 pyon/ion/endpoint.py
+77 −22 pyon/ion/event.py
+322 −83 pyon/ion/exchange.py
+212 −36 pyon/ion/test/test_exchange.py
+42 −8 pyon/net/endpoint.py
+0 −6 pyon/net/test/test_channel.py
+0 −6 pyon/net/test/test_endpoint.py
+15 −0 pyon/net/transport.py
+1 −1 pyon/util/queueblame_plugin.py
9 changes: 0 additions & 9 deletions ion/core/process/transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ def __init__(self):
super(TransformBase,self).__init__()
self._stats = {} # Container for statistics information

def on_start(self):
'''
Begins listening for incoming RPC calls.
'''
super(TransformBase,self).on_start()
self._rpc_server = self.container.proc_manager._create_listening_endpoint(from_name=self.id,
process=self)
self.add_endpoint(self._rpc_server)

def _stat(self):
return self._stats

Expand Down
24 changes: 13 additions & 11 deletions ion/services/coi/exchange_management_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class ExchangeManagementService(BaseExchangeManagementService):
The Exchange Management Service is the service that manages the Exchange and its associated resources, such as Exchange Spaces, Names, Points and Brokers.

"""
typemap = { 'XN_SERVICE':'service', 'XN_PROCESS':'process', 'XN_QUEUE':'queue' }

def create_exchange_space(self, exchange_space=None, org_id=''):
"""Creates an Exchange Space distributed resource from the parameter exchange_space object.

Expand Down Expand Up @@ -108,8 +110,8 @@ def delete_exchange_space(self, exchange_space_id=''):
# delete XS now
self.container.resource_registry.delete(exchange_space_id)

# call container API to delete @TODO this is clunky
xs = exchange.ExchangeSpace(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_space.name)
# call container API to delete
xs = self.container.ex_manager.create_xs(exchange_space.name, use_ems=False, declare=False)
self.container.ex_manager.delete_xs(xs, use_ems=False)

def find_exchange_spaces(self, filters=None):
Expand All @@ -130,8 +132,7 @@ def declare_exchange_name(self, exchange_name=None, exchange_space_id=''):
@throws BadRequest if object passed has _id or _rev attribute
"""
# get xntype and translate @TODO should we just consolidate these to be the same?
typemap = { 'XN_SERVICE':'service', 'XN_PROCESS':'process', 'XN_QUEUE':'queue' }
if not exchange_name.xn_type in typemap:
if not exchange_name.xn_type in self.typemap:
raise BadRequest("Unknown exchange name type: %s" % exchange_name.xn_type)

xns, assocs = self.container.resource_registry.find_objects(subject=exchange_space_id, predicate=PRED.hasExchangeName, id_only=False)
Expand All @@ -141,7 +142,7 @@ def declare_exchange_name(self, exchange_name=None, exchange_space_id=''):
exchange_name_id = xn._id


xntype = typemap[exchange_name.xn_type]
xntype = self.typemap[exchange_name.xn_type]

exchange_space = self.read_exchange_space(exchange_space_id)
if not exchange_name_id:
Expand All @@ -150,7 +151,7 @@ def declare_exchange_name(self, exchange_name=None, exchange_space_id=''):
aid = self.container.resource_registry.create_association(exchange_space_id, PRED.hasExchangeName, exchange_name_id)

# call container API
xs = exchange.ExchangeSpace(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_space.name)
xs = self.container.ex_manager.create_xs(exchange_space.name, use_ems=False)
self.container.ex_manager._create_xn(xntype, exchange_name.name, xs, use_ems=False)

return exchange_name_id #QUestion - is this the correct canonical name?
Expand Down Expand Up @@ -187,8 +188,9 @@ def undeclare_exchange_name(self, canonical_name='', exchange_space_id=''):
self.container.resource_registry.delete(exchange_name_id)

# call container API
xs = exchange.ExchangeSpace(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_space.name)
xn = exchange.ExchangeName(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_name.name, xs) # type doesn't matter here
xntype = self.typemap[exchange_name.xn_type]
xs = self.container.ex_manager.create_xs(exchange_space.name, use_ems=False, declare=False)
xn = self.container.ex_manager._create_xn(xntype, exchange_name.name, xs, use_ems=False, declare=False)
self.container.ex_manager.delete_xn(xn, use_ems=False)

def find_exchange_names(self, filters=None):
Expand Down Expand Up @@ -222,7 +224,7 @@ def create_exchange_point(self, exchange_point=None, exchange_space_id=''):
self.container.resource_registry.create_association(exchange_space_id, PRED.hasExchangePoint, exchange_point_id)

# call container API
xs = exchange.ExchangeSpace(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_space.name)
xs = self.container.ex_manager.create_xs(exchange_space.name, use_ems=False)
self.container.ex_manager.create_xp(exchange_point.name, xs, xptype=exchange_point.topology_type, use_ems=False)

return exchange_point_id
Expand Down Expand Up @@ -276,8 +278,8 @@ def delete_exchange_point(self, exchange_point_id=''):
self.container.resource_registry.delete(exchange_point_id)

# call container API
xs = exchange.ExchangeSpace(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_space.name)
xp = exchange.ExchangePoint(self.container.ex_manager, self.container.ex_manager._priviledged_transport, exchange_point.name, xs, 'ttree')
xs = self.container.ex_manager.create_xs(exchange_space.name, use_ems=False, declare=False)
xp = self.container.ex_manager.create_xp(exchange_point.name, xs, xptype=exchange_point.topology_type, use_ems=False, declare=False)
self.container.ex_manager.delete_xp(xp, use_ems=False)

def find_exchange_points(self, filters=None):
Expand Down