summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* AhemSimon MacMullen2013-02-201-2/+2
|
* Be more careful about where we send_drained from.Simon MacMullen2013-02-201-7/+25
|
* NeatnessSimon MacMullen2013-02-201-3/+2
|
* merge default into bug23749Matthias Radestock2013-02-2012-142/+204
|\
| * Remove spurious blank line in the logs.Simon MacMullen2013-02-201-1/+1
| |
| * merge bug25418 into defaultTim Watson2013-02-201-3/+24
| |\
| | * Auto sync when policy changes to require it, in case we are already mirrored ↵Simon MacMullen2013-02-131-7/+11
| | | | | | | | | | | | but have unsynced slaves at that point.
| | * First pass at ha-sync-mode.Simon MacMullen2013-02-111-4/+21
| | |
| * | stable to defaultSimon MacMullen2013-02-198-78/+74
| |\ \
| | * \ Merge bug25457Simon MacMullen2013-02-197-30/+20
| | |\ \
| | | * \ Merged bug25456 into stableEmile Joubert2013-02-191-1/+5
| | | |\ \
| | | | * \ Merged bug25453 into stableEmile Joubert2013-02-190-0/+0
| | | | |\ \
| | | | * | | Take note of RABBITMQ_SERVICENAME, same as rabbitmq-service.bat does.Simon MacMullen2013-02-151-1/+5
| | | | |/ /
| | | * | | Remove rabbit_runtime_parameter:validate_clear/3, and instead just validate ↵Simon MacMullen2013-02-185-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | that the parameter exists.
| | | * | | It's 'name', not 'key'.Simon MacMullen2013-02-151-2/+2
| | | |/ /
| | * | | Ensure that we resume socket reading in all edge casesMatthias Radestock2013-02-181-48/+54
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically in all the cases where handle_other might have changed the connection_state. This is most straightforward and obvious to guarantee by always invoking recvloop after handle_other, unless we are stopping. This does expose an inconsistency in the various non-throw/exit termination cases: two of them were returning State, the other ok. Let's go with the latter; it's easiest. We also take the opportunity to eliminate 'Deb' from the handle_other signature. This is only needed in the {system, ...} message case, which we now handle specially.
| * | | explain a reader subletyMatthias Radestock2013-02-151-1/+3
| | | |
| * | | refactor: more symmetry in rabbit_reader:handle_dependent_exit/3Matthias Radestock2013-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It makes no difference whether we call handle_exception before or after control_throttle, so lets use an order that more clearly calls out the similarity to the controlled exit case.
| * | | make reader's handling of channel.close_ok more obviously correctMatthias Radestock2013-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by re-introducing a call to control_throttle. This was present in 3.0.x, and is needed there, but is actually not needed here, due to other changes made in the area. But the reason is quite subtle... For control_throttle to do something here, the channel_cleanup would have to be called for a channel for which we have run out of credit. Now, credit is only consumed when sending content-bearing methods to the channel with rabbit_channel:do_flow. There is a subsequent invocation of control_throttle in the code which will set the connection_state to 'blocking'. But this is immediately followed by a call to post_process_frame. The frame we are looking at must be the last frame of a content-bearing method, since otherwise the method would not be complete and we wouldn't have passed it to the channel. Hence that frame can only be a content_header or, more likely, a content_body. For both of these, post_process_frame invokes maybe_block, which will turn a 'blocking' into 'blocked'. And from that point onwards we will no longer read anything from the socket or process anything already in buf. So we certainly can't be processing a channel.close_ok. In other words, post_process_frame can only be invoked with a channel.close_ok frame when the connection_state is 'running', or blocking/blocked for a reason other than having run out of credit for a channel, i.e. an alarm. Therefore forgetting about the channel as part of the channel_cleanup call does not have an effect on credit_flow:blocked(). And hence an invocation of control_throttle will not alter the connection_state and is therefore unnecessary.
| * | | make reader's handle_dependent_exit clearerMatthias Radestock2013-02-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | - handle the no-op case (controlled exit of a channel we've forgotten about already) explicitly - better clause order and formatting.
| * | | TypoSimon MacMullen2013-02-151-1/+1
| | | |
| * | | Merged bug25247Emile Joubert2013-02-155-37/+60
| |\ \ \
| | * | | tweakMatthias Radestock2013-02-151-9/+8
| | | | |
| | * | | explainMatthias Radestock2013-02-151-0/+10
| | | | |
| | * | | merge stable into defaultMatthias Radestock2013-02-1446-1479/+2337
| | |\ \ \ | | | |/ / | | |/| |
| | * | | merge bug25419 into stableMatthias Radestock2013-02-140-0/+0
| | |\ \ \
| | * | | | cosmeticMatthias Radestock2013-02-141-2/+2
| | | | | |
| | * | | | In case the containing process is trapping exits.Simon MacMullen2013-02-141-0/+1
| | | | | |
| | * | | | Don't stomp on the (possible) registered name of the thing that invokes ↵Simon MacMullen2013-02-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | boot/0 or start/0, create a new process to hold the name instead.
| | * | | | If we try to stop while starting, wait until we have stopped starting before ↵Simon MacMullen2013-02-141-0/+8
| | |/ / / | | | | | | | | | | | | | | | stopping.
| * | | | remove icky use of element/2Matthias Radestock2013-02-121-4/+5
| | | | |
| * | | | Tweak nodes policy to allow master removal and thus queue migrationSimon MacMullen2013-02-123-49/+73
| | | | |
* | | | | merge default into bug23749Matthias Radestock2013-02-145-39/+44
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge headsMatthias Radestock2013-02-141-13/+22
| |\ \ \ \
| | * \ \ \ Merge bug25451Simon MacMullen2013-02-140-0/+0
| | |\ \ \ \
| | * | | | | drop_expired_msgs only when the queue head changesMatthias Radestock2013-02-131-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And on recover. And when the timer goes off. That's all we need. new call sites: - in deliver_or_enqueue/3, when enqueuing a message (that we couldn't deliver to a consumer straight away) with an expiry to the head. the queue. NB: Previously we were always (re)setting a timer when enqueuing a message with an expiry, which is wasteful when the new message isn't at the head (i.e. the queue was non-empty) or when it needs expiring immediately. - requeue_and_run/2, since a message may get requeued to the head. This call site arises due to removal of the run_message_queue/1 call site (see below). unchanged call sites: - init_ttl/2 - this is the recovery case - fetch/2, after fetching - this is the basic "queue head changes" case - handle_info/drop_expired - this is the message expiry timer removed call sites: - run_message_queue/1 - this internally calls fetch/2 (see above) but also invoking drop_expired_msgs at the beginning. This now happens at the call sites, where it is necessary. Which actually only is in requeue_and_run, and not the others, none of which change the queue content prior to calling run_message_queue/1 - possibly_unblock/3 - unblocking of consumers - handle_call/basic_consumer - adding a consumer - handle_call/basic_get, prior to the call to fetch/2. - handle_call/stat
| | * | | | | don't invoke run_message_queue in handle_cast/run_backing_queueMatthias Radestock2013-02-131-2/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since that would only be necessary of the BQ:invoke modified the consumers, which it can't, or added messages to the queue, which it shouldn't.
| * | | | | remove superfluous vqstate fieldMatthias Radestock2013-02-142-11/+3
| |/ / / /
| * | | | Today's arbitrary startup banner change: centre the rabbit.Simon MacMullen2013-02-131-7/+7
| | | | |
| * | | | stable to defaultSimon MacMullen2013-02-131-5/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge bug25448Simon MacMullen2013-02-130-0/+0
| | |\ \ \
| | * | | | drop expired messages post basic_getMatthias Radestock2013-02-121-5/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...so messages with an expiry that are at the head of the queue after a basic.get do not get stuck there in the absence of other queue activity. Rather than simply adding a call to drop_expired_messages/1 after the call to fetch/1 in the basic_get code, we insert the call into fetch/1, which allows us to remove it from the other call site. Thus fetch/1 preserves the invariant we are after, namely that whenever a queue has a message at the head with an expiry, there is a timer set to drop said message. Note that the message count returned by basic.get does not reflect the dropping of expired messages after the fetched message. That's ok since we make no guarantee that messages are expired straight away. And note that on 'default' (rather than 'stable') the behaviour is actually different; due to various other changes there we will in fact return the reduced count.
| * | | | optimiseMatthias Radestock2013-02-121-1/+7
| | |/ / | |/| |
| * | | Merge bug25044 (fa1429850857)Emile Joubert2013-02-122-19/+19
| |\ \ \
| * | | | That doesn't need a name either (in fact even less so, since it never ends ↵Simon MacMullen2013-02-111-2/+1
| | | | | | | | | | | | | | | | | | | | up in the registry).
* | | | | simplify & optimise maybe_send_drainedMatthias Radestock2013-02-121-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | - use BQ:is_empty instead of BQ:len - make use of Stop flag
* | | | | Clear drain flag when we run out of credit.Simon MacMullen2013-02-121-2/+5
| | | | |
* | | | | Remove tags from blocked_ctags when a consumer goes away.Simon MacMullen2013-02-121-2/+4
| | | | |
* | | | | Move blocked_ctags into the limiter.Simon MacMullen2013-02-122-26/+29
| | | | |
* | | | | s/q_state/credits/gSimon MacMullen2013-02-121-15/+15
| | | | |
View Lorry Controller Status