summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Start epmd in the Windows-y way on Cygwin.bug24494Simon MacMullen2012-02-212-5/+10
|
* Tweak error messages.Simon MacMullen2012-02-211-4/+4
|
* Minimise distance from defaultSimon MacMullen2012-02-211-3/+2
|
* bring this branch a bit closer to defaultAlexandru Scvortov2012-02-172-9/+8
|
* merge default into bug24494Alexandru Scvortov2012-02-1711-19/+61
|\
| * move print_error back into control and pluginsAlexandru Scvortov2012-02-173-16/+16
| |
| * move start_net_kernel into rabbit_nodesAlexandru Scvortov2012-02-174-26/+29
| |
| * Just in case someone comes along and goes "oh, it works now".Simon MacMullen2012-02-172-2/+2
| |
| * merge default into bug24494Alexandru Scvortov2012-02-1511-28/+67
| |\
| | * silence epmd startAlexandru Scvortov2012-01-313-3/+9
| | |
| | * let erlang start epmd on windowsAlexandru Scvortov2012-01-312-12/+4
| | |
| | * Backed out changeset 6bdb3b57d0c5Alexandru Scvortov2012-01-313-25/+12
| | |
| | * try to start epmd as a background jobAlexandru Scvortov2012-01-313-12/+25
| | |
| | * merge default into bug24494Alexandru Scvortov2012-01-3052-643/+960
| | |\
| | * | typoAlexandru Scvortov2011-12-051-1/+1
| | | |
| | * | find epmd.exe on windowsAlexandru Scvortov2011-12-052-8/+10
| | | |
| | * | backout b46a8c86ff10Alexandru Scvortov2011-12-054-8/+4
| | | |
| | * | merge default into bug24494Alexandru Scvortov2011-12-0520-94/+217
| | |\ \
| | * | | increase the wait to account for the overhead of starting another ↵Alexandru Scvortov2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | distributed node
| | * | | start epmd in a uniform way on windows/linuxAlexandru Scvortov2011-11-014-4/+8
| | | | |
| | * | | merge default into bug24494Alexandru Scvortov2011-11-0110-26/+65
| | |\ \ \
| | | * | | I think thisn is clearer if not broken onto two lines.Simon MacMullen2011-10-252-4/+2
| | | | | |
| | | * | | I always hate it when Matthias does this to me, but really, these comments ↵Simon MacMullen2011-10-254-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | tell us little.
| | | * | | Nicer yet.Simon MacMullen2011-10-251-1/+2
| | | | | |
| | | * | | Better error message.Simon MacMullen2011-10-251-2/+7
| | | | | |
| | | * | | add special case for the only error I could findAlexandru Scvortov2011-10-241-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two things that may break network-wise when starting rabbit: epmd may fail to start for some reason, net_kernel may fail to start for some reason. We're now starting epmd manually, because net_kernel needs it; also, there doesn't seem to be a way to start it from Erlang, so we have to start it from the shell scripts. Of course, running it in daemon mode hides any errors it may encounter completely; i.e. there's no way to tell if "epmd -daemon" actually started the daemon. There isn't any documentation for what errors net_kernel:start/1 may return, so we print a vague error message and exit in case of an error. There's also a bit of special handling for the case in which epmd didn't start (detected because something deep down in Erlang fails to start).
| | | * | | plugins should not be a named nodeAlexandru Scvortov2011-10-242-2/+1
| | | | | |
| | | * | | catch net_kernel errors in ctl as wellAlexandru Scvortov2011-10-245-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And always start the new node on the current hostname; otherwise, it gets started on 'nohost'.
| | | * | | start networking kernel manuallyAlexandru Scvortov2011-10-246-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALso, move print_error/2 to rabbit_misc since it's now used by control, plugins and prelaunch. We need to start epmd manually now (because net_kernel:start/1 fails otherwise). Running "epmd -daemon" repeatedly seems to have no adverse effects.
* | | | | | merge bug24381 into default (Windows INSTALL file is not readable using notepad)Alexandru Scvortov2012-02-171-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use DOS/Windows linebreaksbug24381Emile Joubert2012-02-161-0/+3
|/ / / / /
* | | | | Merge bug24086Simon MacMullen2012-02-156-36/+55
|\ \ \ \ \
| * | | | | refactor: less strange variable scopingMatthias Radestock2012-02-141-7/+8
| | | | | |
| * | | | | Remerge bug24714Emile Joubert2012-02-152-13/+8
| |\ \ \ \ \
| | * | | | | Unmerge bug20337Emile Joubert2012-02-151-1/+1
| | | | | | |
| | * | | | | simplifying refactorMatthias Radestock2012-02-131-12/+7
| | | | | | |
| * | | | | | monitor nodes just oncebug24714Matthias Radestock2012-02-091-9/+12
| |/ / / / /
| * | | | | remove cruftMatthias Radestock2012-02-091-1/+1
| | | | | |
| * | | | | Merge bug24668 (make consumer flow control more like credit_flow; improve ↵Simon MacMullen2012-02-093-6/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | performance along the way)
| | * | | | | Cosmeticbug24668Simon MacMullen2012-02-091-1/+1
| | | | | | |
| | * | | | | credit_flow-like throttling of queue->writer message flowMatthias Radestock2012-02-073-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we effectively had a credit_spec of {100,1}, i.e. the queue would send up to 100 messages to a consumer channel/writer, and the writer would 'ack' them individually. That is horrendeously inefficient: - when draining a queue, after the queue had sent 100 messages it would block the consumer, unblock when the notify_sent 'ack' came in, send another message to the channel/queue, block again. So a vast amount of work per message - in a cluster, the notify_sent 'acks' effectively doubled the cross-cluster traffic We now use a scheme much like credit_flow. Except we cannot *actually* use credit_flow because - rather than wanting to know whether a sender is lacking credit for *any* receiver, as indicated by credit_flow:blocked(), we need to know *which* receiver we are lacking credit for. - (lack of) credit from receiver should *not* propagate to senders, i.e. sender and receiver credits are completely decoupled. Instead the queue should, er, queue messages when receivers cannot keep up. While we could modify credit_flow to accomodate the above, the changes would be quite unpleasant and not actually reduce the amount of code vs implementing a more specialised scheme. The downside is that the contract for using rabbit_amqqueue:notify_sent becomes somewhat mysterious. In particular it sets up a monitor for queues in the caller, and expects the caller to invoke rabbit_amqqueue:notify_sent_queue_down when a 'DOWN' message is received.
* | | | | | | handle framing errors promptlybug24086Matthias Radestock2012-02-091-10/+10
|/ / / / / /
* | | | | | refactor channel frame handlingMatthias Radestock2012-02-091-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...so there is just one process_channel_frame call site. Also, ensure control_throttle isn't called twice, which would happen when processing a 'channel.close_ok' frame. No harm in it, really, but unnecessary.
* | | | | | Merged bug24505 into defaultEmile Joubert2012-02-083-103/+117
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bug24234Simon MacMullen2012-02-081-11/+32
| |\ \ \ \ \ \
| | * | | | | | Committed some changes by mistake...bug24234Francesco Mazzoli2012-02-013-32/+13
| | | | | | | |
| | * | | | | | Cosmetic, restored reject/4 arguments to the previous order.Francesco Mazzoli2012-02-014-20/+40
| | | | | | | |
| | * | | | | | Merge default.Francesco Mazzoli2012-02-011-12/+32
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge default.Francesco Mazzoli2012-01-3118-257/+445
| | | |\ \ \ \ \ \
| | | * | | | | | | Renamede reject_tx/4 to reject/4.Francesco Mazzoli2012-01-311-4/+4
| | | | | | | | | |