Merge branch 'release/0.4.7'

leo-project · May 21, 2015 · 23306e9 · 23306e9
2 parents 2eccd69 + 1f0261b
commit 23306e9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/rebar.config b/rebar.config
@@ -23,7 +23,7 @@
 {require_otp_vsn, "R16B*|17"}.
 
 {deps, [
-        {savanna_commons, ".*", {git, "https://github.com/leo-project/savanna_commons.git", {tag, "0.8.8"}}}
+        {savanna_commons, ".*", {git, "https://github.com/leo-project/savanna_commons.git", {tag, "0.8.10"}}}
        ]}.
 
 {erl_opts, [{d, 'NOTEST'},

diff --git a/src/savanna_agent.app.src b/src/savanna_agent.app.src
@@ -23,7 +23,7 @@
 {application, savanna_agent,
  [
   {description, "Savanna Agent"},
-  {vsn, "0.4.6"},
+  {vsn, "0.4.7"},
   {registered, []},
   {applications, [
                   kernel,

diff --git a/src/savanna_agent.erl b/src/savanna_agent.erl
@@ -45,9 +45,9 @@
 start(MnesiaDiscType) ->
     _ = mnesia:start(),
     Nodes = [erlang:node()],
-    {atomic,ok} = svc_tbl_schema:create_table(MnesiaDiscType, Nodes),
-    {atomic,ok} = svc_tbl_column:create_table(MnesiaDiscType, Nodes),
-    {atomic,ok} = svc_tbl_metric_group:create_table(MnesiaDiscType, Nodes),
+    ok = svc_tbl_schema:create_table(MnesiaDiscType, Nodes),
+    ok = svc_tbl_column:create_table(MnesiaDiscType, Nodes),
+    ok = svc_tbl_metric_group:create_table(MnesiaDiscType, Nodes),
     application:start(savanna_agent).
 
 

diff --git a/src/savanna_agent_tbl_members.erl b/src/savanna_agent_tbl_members.erl
@@ -45,20 +45,27 @@
 -spec(create_table(disc_copies|ram_copies, [atom()]) ->
              {atomic, ok} | {aborted, any()}).
 create_table(Mode, Nodes) ->
-    mnesia:create_table(
-      ?TBL_NAME,
-      [{Mode, Nodes},
-       {type, set},
-       {record_name, member},
-       {attributes, record_info(fields, member)},
-       {user_properties,
-        [
-         {node,       atom,        primary},
-         {ip,         string,      false  },
-         {port,       pos_integer, false  },
-         {state,      atom,        false  }
-        ]}
-      ]).
+    case mnesia:create_table(
+           ?TBL_NAME,
+           [{Mode, Nodes},
+            {type, set},
+            {record_name, member},
+            {attributes, record_info(fields, member)},
+            {user_properties,
+             [
+              {node,       atom,        primary},
+              {ip,         string,      false  },
+              {port,       pos_integer, false  },
+              {state,      atom,        false  }
+             ]}
+           ]) of
+        {atomic, ok} ->
+            ok;
+        {aborted,{already_exists,_}} ->
+            ok;
+        {aborted,Error} ->
+            {error, Error}
+    end.
 
 
 %% @doc Retrieve all records

diff --git a/test/savanna_agent_tbl_members_test.erl b/test/savanna_agent_tbl_members_test.erl
@@ -39,7 +39,7 @@ suite_test_() ->
 
 
 suite() ->
-    {atomic, ok} = savanna_agent_tbl_members:create_table(ram_copies, [node()]),
+    ok = savanna_agent_tbl_members:create_table(ram_copies, [node()]),
     not_found = savanna_agent_tbl_members:all(),
     not_found = savanna_agent_tbl_members:get(node()),