diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-05 16:37:00 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-05 16:37:00 +0100 |
| commit | 0c1330a27c78f9e888b96ed723c564a25bc9a15e (patch) | |
| tree | e4bf5a7a5039a60750ffd7757bbe7d17f6e8a1a9 | |
| parent | dc4155f2f35ea960c16501f897d638a9408346a6 (diff) | |
| download | rabbitmq-server-git-0c1330a27c78f9e888b96ed723c564a25bc9a15e.tar.gz | |
Fix tests, cosmetic.
| -rw-r--r-- | src/rabbit_backing_queue_qc.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_backing_queue_qc.erl b/src/rabbit_backing_queue_qc.erl index 49b71122a8..622b1b161f 100644 --- a/src/rabbit_backing_queue_qc.erl +++ b/src/rabbit_backing_queue_qc.erl @@ -116,7 +116,8 @@ qc_publish(#state{bqstate = BQ}) -> [qc_message(), #message_properties{needs_confirming = frequency([{1, true}, {20, false}]), - expiry = oneof([undefined | lists:seq(1, 10)])}, + expiry = oneof([undefined | lists:seq(1, 10)]), + size = 10}, false, self(), BQ]}. qc_publish_multiple(#state{}) -> @@ -124,7 +125,7 @@ qc_publish_multiple(#state{}) -> qc_publish_delivered(#state{bqstate = BQ}) -> {call, ?BQMOD, publish_delivered, - [qc_message(), #message_properties{}, self(), BQ]}. + [qc_message(), #message_properties{size = 10}, self(), BQ]}. qc_fetch(#state{bqstate = BQ}) -> {call, ?BQMOD, fetch, [boolean(), BQ]}. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 3f41f2cc02..a598dfab6c 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1161,7 +1161,7 @@ upd_bytes(Sign, MsgStatus = #msg_status{msg = _}, State) -> upd_bytes0(Sign, MsgStatus = #msg_status{is_persistent = IsPersistent}, State = #vqstate{bytes = Bytes, - persistent_bytes = PBytes}) -> + persistent_bytes = PBytes}) -> Diff = Sign * msg_size(MsgStatus), State#vqstate{bytes = Bytes + Diff, persistent_bytes = PBytes + one_if(IsPersistent) * Diff}. |