greg/wterl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Forgot to remove second use of checkpoint setting.

Browse source
This commit is contained in:
Gregory Burd 2013-11-18 20:50:26 -05:00
parent e560185420
commit 36faa4e713
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/riak_kv_wterl_backend.erl
View file

@ -405,12 +405,12 @@ establish_connection(Config, Type) ->
case LogSetting of case LogSetting of
true -> true ->
%% Turn checkpoints on if logging is on, checkpoints enable log archival. %% Turn checkpoints on if logging is on, checkpoints enable log archival.
app_helper:get_prop_or_env(checkpoint, Config, wterl, [{wait, 30}]); % in seconds app_helper:get_prop_or_env(checkpoint, Config, wterl, {wait, 30}); % in seconds
_ -> _ ->
[] []
end; end;
false -> false ->
app_helper:get_prop_or_env(checkpoint, Config, wterl, [{wait, 30}]) app_helper:get_prop_or_env(checkpoint, Config, wterl, {wait, 30})
end, end,
RequestedCacheSize = app_helper:get_prop_or_env(cache_size, Config, wterl), RequestedCacheSize = app_helper:get_prop_or_env(cache_size, Config, wterl),
ConnectionOpts = ConnectionOpts =
@ -419,7 +419,7 @@ establish_connection(Config, Type) ->
wterl:config_value(checkpoint_sync, Config, false), wterl:config_value(checkpoint_sync, Config, false),
wterl:config_value(transaction_sync, Config, "none"), wterl:config_value(transaction_sync, Config, "none"),
wterl:config_value(log, Config, [{enabled, LogSetting}]), wterl:config_value(log, Config, [{enabled, LogSetting}]),
wterl:config_value(checkpoint, Config, CheckpointSetting), wterl:config_value(checkpoint, Config, [CheckpointSetting]),
wterl:config_value(session_max, Config, max_sessions(Config)), wterl:config_value(session_max, Config, max_sessions(Config)),
wterl:config_value(cache_size, Config, size_cache(RequestedCacheSize)), wterl:config_value(cache_size, Config, size_cache(RequestedCacheSize)),
wterl:config_value(statistics_log, Config, [{wait, 600}]), % in seconds wterl:config_value(statistics_log, Config, [{wait, 600}]), % in seconds
@ -430,7 +430,7 @@ establish_connection(Config, Type) ->
%"block", "shared_cache", "reconcile", "evict", "lsm", %"block", "shared_cache", "reconcile", "evict", "lsm",
%"fileops", "read", "write", "readserver", "evictserver", %"fileops", "read", "write", "readserver", "evictserver",
%"hazard", "mutex", "ckpt" %"hazard", "mutex", "ckpt"
]) ] ++ CheckpointSetting ++ proplists:get_value(wterl, Config, [])), % sec ]) ] ++ proplists:get_value(wterl, Config, [])), % sec
%% WT Session Options: %% WT Session Options:
SessionOpts = [{isolation, "snapshot"}], SessionOpts = [{isolation, "snapshot"}],