diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-03 13:43:32 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-03 13:43:32 +0000 |
| commit | 03fe8e39e9dc2f960820bfa349c3653f312e0487 (patch) | |
| tree | 2fef0ee95deb75e2f4f0011bb1f82978184bdbeb | |
| parent | f3f83f0a6c1430e8add101466179d3a2905eaece (diff) | |
| parent | 02eb85f50553ee6d1fc02d7c2b1fdc7c1565f366 (diff) | |
| download | rabbitmq-server-git-03fe8e39e9dc2f960820bfa349c3653f312e0487.tar.gz | |
merged bug19758 into default
| -rw-r--r-- | src/rabbit_router.erl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl index a233764766..58eb5b54f6 100644 --- a/src/rabbit_router.erl +++ b/src/rabbit_router.erl @@ -36,6 +36,9 @@ -define(SERVER, ?MODULE). +%% cross-node routing optimisation is disabled because of bug 19758. +-define(BUG19758, true). + %%---------------------------------------------------------------------------- -ifdef(use_specs). @@ -51,6 +54,14 @@ start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). +-ifdef(BUG19758). + +deliver(QPids, Mandatory, Immediate, Txn, Message) -> + check_delivery(Mandatory, Immediate, + run_bindings(QPids, Mandatory, Immediate, Txn, Message)). + +-else. + deliver(QPids, Mandatory, Immediate, Txn, Message) -> %% we reduce inter-node traffic by grouping the qpids by node and %% only delivering one copy of the message to each node involved, @@ -114,6 +125,8 @@ deliver_per_node(NodeQPids, Mandatory, Immediate, R), check_delivery(Mandatory, Immediate, {Routed, lists:append(Handled)}). +-endif. + %%-------------------------------------------------------------------- init([]) -> |