diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:18:24 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:18:24 +0300 |
| commit | e8446a21d053445aaa856e300960656dab9ada66 (patch) | |
| tree | 1257235e3153f7f14dbd2915df76c0e121426577 | |
| parent | 76f9565ecc25357d894508f61e1d2864176de527 (diff) | |
| parent | 0c9bf69dc9d96cfe4b100c289e7ef259caa74253 (diff) | |
| download | rabbitmq-server-git-e8446a21d053445aaa856e300960656dab9ada66.tar.gz | |
Merge branch 'stable'
Make credit flow setting a tuple, per discussion with @videlalvaro.
| -rw-r--r-- | ebin/rabbit_app.in | 6 | ||||
| -rw-r--r-- | src/credit_flow.erl | 7 | ||||
| -rw-r--r-- | test/src/credit_flow_test.erl | 7 | ||||
| -rw-r--r-- | test/src/rabbit_tests.erl | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index fa70058930..ac60ed6825 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -84,8 +84,6 @@ {ssl_apps, [asn1, crypto, public_key, ssl]}, %% see rabbitmq-server#114 {mirroring_flow_control, true}, - {credit_flow_initial_credit, 200}, - {credit_flow_more_credit_after, 50}, %% see rabbitmq-server#227 and related tickets. %% msg_store_credit_disc_bound only takes effect when %% messages are persisted to the message store. If messages @@ -94,5 +92,7 @@ %% writing to the queue index. See the setting %% queue_index_embed_msgs_below above. {msg_store_credit_disc_bound, {2000, 500}}, - {msg_store_io_batch_size, 2048} + {msg_store_io_batch_size, 2048}, + %% see rabbitmq-server#143 + {credit_flow_default_credit, {200, 50}} ]}]}. diff --git a/src/credit_flow.erl b/src/credit_flow.erl index d2f2355f03..02fd19620b 100644 --- a/src/credit_flow.erl +++ b/src/credit_flow.erl @@ -34,10 +34,9 @@ -define(DEFAULT_CREDIT, case get(credit_flow_default_credit) of undefined -> - Val = {rabbit_misc:get_env(rabbit, credit_flow_initial_credit, - ?DEFAULT_INITIAL_CREDIT), - rabbit_misc:get_env(rabbit, credit_flow_more_credit_after, - ?DEFAULT_MORE_CREDIT_AFTER)}, + Val = rabbit_misc:get_env(rabbit, credit_flow_default_credit, + {?DEFAULT_INITIAL_CREDIT, + ?DEFAULT_MORE_CREDIT_AFTER}), put(credit_flow_default_credit, Val), Val; Val -> Val diff --git a/test/src/credit_flow_test.erl b/test/src/credit_flow_test.erl index db014888eb..4910da3db3 100644 --- a/test/src/credit_flow_test.erl +++ b/test/src/credit_flow_test.erl @@ -22,12 +22,11 @@ test_credit_flow_settings() -> %% default values passed = test_proc(200, 50), - application:set_env(rabbit, credit_flow_initial_credit, 100), - application:set_env(rabbit, credit_flow_more_credit_after, 20), + application:set_env(rabbit, credit_flow_default_credit, {100, 20}), passed = test_proc(100, 20), - application:unset_env(rabbit, credit_flow_initial_credit), - application:unset_env(rabbit, credit_flow_more_credit_after), + application:unset_env(rabbit, credit_flow_default_credit), + % back to defaults passed = test_proc(200, 50), passed. diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index 188222057b..6157b483e0 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -92,6 +92,7 @@ all_tests0() -> passed = vm_memory_monitor_tests:all_tests(), passed = credit_flow_test:test_credit_flow_settings(), passed = on_disk_store_tunable_parameter_validation_test:test_msg_store_parameter_validation(), + passed = credit_flow_test:test_credit_flow_settings(), passed. do_if_secondary_node(Up, Down) -> |