Merge branch 'uw/mnesia-majority' into dev

* uw/mnesia-majority:
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  Write locks now check majority when needed.
  Add {majority, boolean()} per-table option.

OTP-9304

3 files changed, 288 insertions, 0 deletions

diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index b165924ef2..ae4c9626c7 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -42,6 +42,7 @@ MODULES= \
 	mnesia_dirty_access_test \
 	mnesia_atomicity_test \
 	mnesia_consistency_test \
+	mnesia_majority_test \
 	mnesia_isolation_test \
 	mnesia_durability_test \
 	mnesia_recovery_test \
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 8ba8427213..dc8f216c1c 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -142,6 +142,105 @@ silly() ->
     mnesia_install_test:silly().
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+light(doc) ->
+    ["The 'light' test suite runs a selected set of test suites and is",
+     "intended to be the smallest test suite that is meaningful",
+     "to run. It starts with an installation test (which in essence is the",
+     "'silly' test case) and then it covers all functions in the API in",
+     "various depths. All configuration parameters and examples are also",
+     "covered."];
+light(suite) ->
+    [
+     install,
+     nice,
+     evil,
+     {mnesia_frag_test, light},
+     qlc,
+     registry,
+     config,
+     examples
+    ].
+
+install(suite) ->
+    [{mnesia_install_test, all}].
+
+nice(suite) ->
+    [{mnesia_nice_coverage_test, all}].
+
+evil(suite) ->
+    [{mnesia_evil_coverage_test, all}].
+
+qlc(suite) ->
+    [{mnesia_qlc_test, all}].
+
+registry(suite) ->
+    [{mnesia_registry_test, all}].
+
+config(suite) ->
+    [{mnesia_config_test, all}].
+
+examples(suite) ->
+    [{mnesia_examples_test, all}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+medium(doc) ->
+    ["The 'medium' test suite verfies the ACID (atomicity, consistency",
+     "isolation and durability) properties and various recovery scenarios",
+     "These tests may take quite while to run."];
+medium(suite) ->
+    [
+     install,
+     atomicity,
+     isolation,
+     durability,
+     recovery,
+     consistency,
+     majority,
+     {mnesia_frag_test, medium}
+    ].
+
+atomicity(suite) ->
+     [{mnesia_atomicity_test, all}].
+
+isolation(suite) ->
+    [{mnesia_isolation_test, all}].
+
+durability(suite) ->
+    [{mnesia_durability_test, all}].
+
+recovery(suite) ->
+    [{mnesia_recovery_test, all}].
+
+consistency(suite) ->
+     [{mnesia_consistency_test, all}].
+
+majority(suite) ->
+    [{mnesia_majority_test, all}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+heavy(doc) ->
+    ["The 'heavy' test suite runs some resource consuming tests and",
+     "benchmarks"];
+heavy(suite) ->
+    [measure].
+
+measure(suite) ->
+    [{mnesia_measure_test, all}].
+
+prediction(suite) ->
+    [{mnesia_measure_test, prediction}].
+
+fairness(suite) ->
+    [{mnesia_measure_test, fairness}].
+
+benchmarks(suite) ->
+    [{mnesia_measure_test, benchmarks}].
+
+consumption(suite) ->
+    [{mnesia_measure_test, consumption}].
+
+scalability(suite) ->
+    [{mnesia_measure_test, scalability}].
 
 clean_up_suite(doc) -> ["Not a test case only kills mnesia and nodes, that where" 
 			"started during the tests"];
diff --git a/lib/mnesia/test/mnesia_majority_test.erl b/lib/mnesia/test/mnesia_majority_test.erl
new file mode 100644
index 0000000000..17d1d8bcdd
--- /dev/null
+++ b/lib/mnesia/test/mnesia_majority_test.erl
@@ -0,0 +1,188 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(mnesia_majority_test).
+-author('[email protected]').
+-compile(export_all).
+-include("mnesia_test_lib.hrl").
+
+init_per_testcase(Func, Conf) ->
+    mnesia_test_lib:init_per_testcase(Func, Conf).
+
+fin_per_testcase(Func, Conf) ->
+    mnesia_test_lib:fin_per_testcase(Func, Conf).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all(doc) ->
+    ["Verify that majority checking works"];
+all(suite) ->
+    [
+     write
+     , wread
+     , delete
+     , clear_table
+     , frag
+     , change_majority
+     , frag_change_majority
+    ].
+
+write(suite) -> [];
+write(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2,N3]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok,ok],[]},
+	   rpc:multicall([N1,N2,N3], mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    mnesia_test_lib:kill_mnesia([N3]),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)).
+
+wread(suite) -> [];
+wread(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read(t,1,write) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:read(t,1,write) end)).
+
+delete(suite) -> [];
+delete(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    %% works as expected with majority of nodes present
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:delete({t,1}) end)),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    %% put the record back
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,[{t,1,a}]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}},
+	   mnesia:transaction(fun() -> mnesia:delete({t,1}) end)).
+
+clear_table(suite) -> [];
+clear_table(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [{name, Tab}, {ram_copies, [N1,N2]}, {majority,true}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match({[ok,ok],[]},
+	   rpc:multicall([N1,N2], mnesia, wait_for_tables, [[Tab], 3000])),
+    %% works as expected with majority of nodes present
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,ok}, mnesia:clear_table(t)),
+    ?match({atomic,[]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    %% put the record back
+    ?match({atomic,ok},
+	   mnesia:transaction(fun() -> mnesia:write({t,1,a}) end)),
+    ?match({atomic,[{t,1,a}]},
+	   mnesia:transaction(fun() -> mnesia:read({t,1}) end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,{no_majority,Tab}}, mnesia:clear_table(t)).
+
+frag(suite) -> [];
+frag(Config) when is_list(Config) ->
+    [N1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1]},
+	      {majority,true},
+	      {frag_properties, [{n_fragments, 2}]}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(true, mnesia:table_info(t_frag2, majority)).
+
+change_majority(suite) -> [];
+change_majority(Config) when is_list(Config) ->
+    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1,N2]},
+	      {majority,false}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(false, mnesia:table_info(t, majority)),
+    ?match({atomic, ok},
+	   mnesia:change_table_majority(t, true)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(ok,
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({'EXIT',{aborted,{no_majority,_}}},
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end)).
+
+frag_change_majority(suite) -> [];
+frag_change_majority(Config) when is_list(Config) ->
+    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = t,
+    Schema = [
+	      {name, Tab}, {ram_copies, [N1,N2]},
+	      {majority,false},
+	      {frag_properties,
+	       [{n_fragments, 2},
+		{n_ram_copies, 2},
+		{node_pool, [N1,N2]}]}
+	     ],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(false, mnesia:table_info(t, majority)),
+    ?match(false, mnesia:table_info(t_frag2, majority)),
+    ?match({aborted,{bad_type,t_frag2}},
+	   mnesia:change_table_majority(t_frag2, true)),
+    ?match({atomic, ok},
+	   mnesia:change_table_majority(t, true)),
+    ?match(true, mnesia:table_info(t, majority)),
+    ?match(true, mnesia:table_info(t_frag2, majority)),
+    ?match(ok,
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end, mnesia_frag)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({'EXIT',{aborted,{no_majority,_}}},
+	   mnesia:activity(transaction, fun() ->
+						mnesia:write({t,1,a})
+					end, mnesia_frag)).