Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  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
  ...

1 files changed, 188 insertions, 0 deletions

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)).