diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-12 13:24:25 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-12 13:24:25 +0000 |
| commit | da724e2dae03806d1be72a4a9df1c9d5dbc2a207 (patch) | |
| tree | 263bf5285bf5be6c2eb068119517a20bd7351ebf | |
| parent | cd1d1235861e39c6d0ce2046cf1f33bd85868ebc (diff) | |
| download | rabbitmq-server-git-da724e2dae03806d1be72a4a9df1c9d5dbc2a207.tar.gz | |
reverting a change to the start up script that I never meant to commit. Also further simplifying logic in the previously faulty function.
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 43488c9274..34904850be 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -109,7 +109,7 @@ exec erl \ -os_mon start_cpu_sup true \ -os_mon start_disksup false \ -os_mon start_memsup false \ - -os_mon vm_memory_high_watermark 0.08 \ + -os_mon vm_memory_high_watermark 0.4 \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 7c644f59f5..de9c08a343 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -963,8 +963,7 @@ push_betas_to_gammas(State = #vqstate { q2 = Q2, gamma = Gamma, q3 = Q3, Limit = rabbit_queue_index:next_segment_boundary(SeqId), %% ASSERTION true = Gamma1SeqId == undefined orelse Gamma1SeqId > SeqIdMax, - case (Gamma1SeqId == undefined andalso SeqIdMax < Limit) orelse - Gamma1SeqId == Limit of + case SeqIdMax < Limit of true -> %% already only holding LTE one segment indices in q3 State1; false -> |