Skip to content

Commit

Permalink
MB-5307 Fix 1.8.1 -> 2.0 upgrade function name.
Browse files Browse the repository at this point in the history
Change-Id: I34900ee585927c03dfa635ca1240c8c4b9d508c8
Reviewed-on: http://review.couchbase.org/19557
Tested-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  • Loading branch information
aartamonau authored and alk committed Aug 13, 2012
1 parent e9b760d commit 7eb2c6c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/ns_config_default.erl
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,9 @@ update_binaries_cfg_pathes_and_add_dedicated_port(Config, DefaultConfig) ->
upgrade_config_from_1_8_1_to_2_0(Config) ->
?log_info("Upgrading config from 1.8.1 to 2.0", []),
DefaultConfig = default(),
do_upgrade_config_from_1_8_0_to_2_0(Config, DefaultConfig).
do_upgrade_config_from_1_8_1_to_2_0(Config, DefaultConfig).

do_upgrade_config_from_1_8_0_to_2_0(Config, DefaultConfig) ->
do_upgrade_config_from_1_8_1_to_2_0(Config, DefaultConfig) ->
MaybeCapiPort = case ns_config:search(Config, {node, node(), capi_port}) of
false ->
{_, DefaultCapiPort} = lists:keyfind({node, node(), capi_port}, 1, DefaultConfig),
Expand Down Expand Up @@ -676,14 +676,14 @@ upgrade_1_8_1_to_2_0_test() ->
{remote_clusters, foobar_2},
{autocompaction, compaction_something},
{{node, node(), compaction_daemon}, compaction_daemon_settings}],
Result = do_upgrade_config_from_1_8_0_to_2_0(Cfg, DefaultCfg),
Result = do_upgrade_config_from_1_8_1_to_2_0(Cfg, DefaultCfg),
?assertEqual([{set, {node, node(), uuid}, <<"--uuid--">>},
{set, autocompaction, compaction_something},
{set, {node, node(), compaction_daemon}, compaction_daemon_settings}],
Result),
Cfg2 = [[{remote_clusters, foobar},
{{node, node(), compaction_daemon}, compaction_daemon_existing}]],
Result2 = do_upgrade_config_from_1_8_0_to_2_0(Cfg2, DefaultCfg),
Result2 = do_upgrade_config_from_1_8_1_to_2_0(Cfg2, DefaultCfg),
?assertEqual([{set, {node, node(), capi_port}, somethingelse},
{set, {node, node(), uuid}, <<"--uuid--">>},
{set, autocompaction, compaction_something}],
Expand Down

0 comments on commit 7eb2c6c

Please sign in to comment.