You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2015/02/11 19:44:31 UTC
svn commit: r1659038 - in /qpid/dispatch/trunk:
python/qpid_dispatch/management/qdrouter.json src/router_config.c
src/router_node.c src/router_private.h tests/config-2-broker/B.conf
Author: tross
Date: Wed Feb 11 18:44:31 2015
New Revision: 1659038
URL: http://svn.apache.org/r1659038
Log:
DISPATCH-6 - Allow configuration of link-route-patterns without an associated connector.
This allows addresses to be "reserved" for link routing on routers even if there isn't
currently a broker anywhere in the reachable network to terminate routed links.
Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
qpid/dispatch/trunk/src/router_config.c
qpid/dispatch/trunk/src/router_node.c
qpid/dispatch/trunk/src/router_private.h
qpid/dispatch/trunk/tests/config-2-broker/B.conf
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json?rev=1659038&r1=1659037&r2=1659038&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json Wed Feb 11 18:44:31 2015
@@ -739,7 +739,8 @@
"connector": {
"description":"The name of the on-demand connector used to reach the waypoint's container.",
"type": "string",
- "required": true,
+ "required": false,
+ "default": "",
"create": true
}
}
Modified: qpid/dispatch/trunk/src/router_config.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_config.c?rev=1659038&r1=1659037&r2=1659038&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_config.c (original)
+++ qpid/dispatch/trunk/src/router_config.c Wed Feb 11 18:44:31 2015
@@ -24,6 +24,7 @@
#include "router_private.h"
#include "lrp_private.h"
#include "entity.h"
+#include "entity_cache.h"
#include "schema_enum.h"
qd_error_t qd_router_configure_address(qd_router_t *router, qd_entity_t *entity) {
@@ -142,58 +143,87 @@ qd_error_t qd_router_configure_lrp(qd_ro
char *connector = qd_entity_get_string(entity, "connector"); QD_ERROR_RET();
sys_mutex_lock(router->lock);
- //
- // Look for an existing lrp_container for the same connector name
- //
- qd_lrp_container_t *lrpc = DEQ_HEAD(router->lrp_containers);
- while (lrpc) {
- if (strcmp(qd_config_connector_name(lrpc->cc), connector) == 0)
- break;
- lrpc = DEQ_NEXT(lrpc);
- }
+ if (connector && connector[0]) {
+ //
+ // Look for an existing lrp_container for the same connector name
+ //
+ qd_lrp_container_t *lrpc = DEQ_HEAD(router->lrp_containers);
+ while (lrpc) {
+ if (strcmp(qd_config_connector_name(lrpc->cc), connector) == 0)
+ break;
+ lrpc = DEQ_NEXT(lrpc);
+ }
- //
- // If no lrp_container was found, create one and add it to the list
- //
- if (lrpc == 0) {
- qd_config_connector_t *cc = qd_connection_manager_find_on_demand(router->qd, connector);
- if (cc) {
- lrpc = NEW(qd_lrp_container_t);
- DEQ_ITEM_INIT(lrpc);
- lrpc->qd = router->qd;
- lrpc->cc = cc;
- lrpc->timer = qd_timer(router->qd, qd_lrpc_timer_handler, lrpc);
- lrpc->conn = 0;
- DEQ_INIT(lrpc->lrps);
- DEQ_INSERT_TAIL(router->lrp_containers, lrpc);
+ //
+ // If no lrp_container was found, create one and add it to the list
+ //
+ if (lrpc == 0) {
+ qd_config_connector_t *cc = qd_connection_manager_find_on_demand(router->qd, connector);
+ if (cc) {
+ lrpc = NEW(qd_lrp_container_t);
+ DEQ_ITEM_INIT(lrpc);
+ lrpc->qd = router->qd;
+ lrpc->cc = cc;
+ lrpc->timer = qd_timer(router->qd, qd_lrpc_timer_handler, lrpc);
+ lrpc->conn = 0;
+ DEQ_INIT(lrpc->lrps);
+ DEQ_INSERT_TAIL(router->lrp_containers, lrpc);
- qd_timer_schedule(lrpc->timer, 0);
+ qd_timer_schedule(lrpc->timer, 0);
+ }
}
- }
- if (lrpc == 0) {
- sys_mutex_unlock(router->lock);
- free(prefix);
- free(connector);
- return qd_error(QD_ERROR_CONFIG, "Link-route-pattern configured with unknown connector: %s", connector);
- }
+ if (lrpc == 0) {
+ sys_mutex_unlock(router->lock);
+ free(prefix);
+ free(connector);
+ return qd_error(QD_ERROR_CONFIG, "Link-route-pattern configured with unknown connector: %s", connector);
+ }
- qd_lrp_t *lrp = qd_lrp_LH(prefix, lrpc);
+ qd_lrp_t *lrp = qd_lrp_LH(prefix, lrpc);
- if (!lrp) {
- sys_mutex_unlock(router->lock);
- free(prefix);
- free(connector);
- return qd_error(QD_ERROR_CONFIG, "Failed to create link-route-pattern: prefix=%s connector=%s",
- prefix, connector);
- }
+ if (!lrp) {
+ sys_mutex_unlock(router->lock);
+ free(prefix);
+ free(connector);
+ return qd_error(QD_ERROR_CONFIG,
+ "Failed to create link-route-pattern: prefix=%s connector=%s", prefix, connector);
+ }
- sys_mutex_unlock(router->lock);
+ qd_log(router->log_source, QD_LOG_INFO,
+ "Configured Link-route-pattern: prefix=%s connector=%s", prefix, connector);
+ } else
+ qd_log(router->log_source, QD_LOG_INFO,
+ "Configured Remote Link-route-pattern: prefix=%s", prefix);
- qd_log(router->log_source, QD_LOG_INFO,
- "Configured Link-route-pattern: prefix=%s connector=%s",
- prefix, connector);
+ //
+ // Create an address iterator for the prefix address with the namespace
+ // prefix for link-attach routed addresses.
+ //
+ char unused;
+ qd_address_t *addr;
+ qd_field_iterator_t *iter = qd_field_iterator_string(prefix, ITER_VIEW_ADDRESS_HASH);
+ qd_field_iterator_override_prefix(iter, 'C');
+
+ //
+ // Find the address in the router's hash table. If not found, create one
+ // and hash it into the table.
+ //
+ qd_hash_retrieve(router->addr_hash, iter, (void**) &addr);
+ if (!addr) {
+ addr = qd_address();
+ qd_hash_insert(router->addr_hash, iter, addr, &addr->hash_handle);
+ DEQ_INSERT_TAIL(router->addrs, addr);
+ addr->semantics = router_semantics_for_addr(router, iter, '\0', &unused);
+ qd_entity_cache_add(QD_ROUTER_ADDRESS_TYPE, addr);
+ }
+ //
+ // Since this is a configured address, block its deletion.
+ //
+ addr->block_deletion = true;
+
+ sys_mutex_unlock(router->lock);
free(prefix);
free(connector);
return qd_error_code();
Modified: qpid/dispatch/trunk/src/router_node.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_node.c?rev=1659038&r1=1659037&r2=1659038&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_node.c (original)
+++ qpid/dispatch/trunk/src/router_node.c Wed Feb 11 18:44:31 2015
@@ -166,7 +166,7 @@ void qd_router_check_addr(qd_router_t *r
//
if (addr->handler == 0 &&
DEQ_SIZE(addr->rlinks) == 0 && DEQ_SIZE(addr->rnodes) == 0 &&
- !addr->waypoint)
+ !addr->waypoint && !addr->block_deletion)
to_delete = 1;
//
Modified: qpid/dispatch/trunk/src/router_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_private.h?rev=1659038&r1=1659037&r2=1659038&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_private.h (original)
+++ qpid/dispatch/trunk/src/router_private.h Wed Feb 11 18:44:31 2015
@@ -176,6 +176,7 @@ struct qd_address_t {
qd_address_t *dynamic_cc;
bool toggle;
bool waypoint;
+ bool block_deletion;
//
// TODO - Add support for asynchronous address lookup:
Modified: qpid/dispatch/trunk/tests/config-2-broker/B.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2-broker/B.conf?rev=1659038&r1=1659037&r2=1659038&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2-broker/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-2-broker/B.conf Wed Feb 11 18:44:31 2015
@@ -64,6 +64,18 @@ router {
router-id: QDR.B
}
+linkRoutePattern {
+ prefix: queue.
+}
+
+linkRoutePattern {
+ prefix: exchange.
+}
+
+linkRoutePattern {
+ prefix: qmf.
+}
+
fixed-address {
prefix: /closest/
fanout: single
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org