Merge branch 'develop'

leo-project · Nov 6, 2017 · e4e58f6 · e4e58f6
2 parents 7eadfa8 + aadb345
commit e4e58f6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/apps/leo_gateway/rebar.config b/apps/leo_gateway/rebar.config
@@ -26,9 +26,9 @@
         {leo_cache,             ".*", {git, "https://github.com/leo-project/leo_cache.git",             {tag, "0.8.6"}}},
         {leo_commons,           ".*", {git, "https://github.com/leo-project/leo_commons.git",           {tag, "1.1.11"}}},
         {leo_logger,            ".*", {git, "https://github.com/leo-project/leo_logger.git",            {tag, "1.3.3"}}},
-        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.19"}}},
+        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.20"}}},
         {leo_pod,               ".*", {git, "https://github.com/leo-project/leo_pod.git",               {tag, "0.6.9"}}},
-        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.51"}}},
+        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.53"}}},
         {leo_statistics,        ".*", {git, "https://github.com/leo-project/leo_statistics.git",        {tag, "1.1.19"}}},
         {leo_s3_libs,           ".*", {git, "https://github.com/leo-project/leo_s3_libs.git",           {tag, "1.2.15"}}},
         {leo_watchdog,          ".*", {git, "https://github.com/leo-project/leo_watchdog.git",          {tag, "1.0.3"}}},

diff --git a/apps/leo_manager/include/leo_manager.hrl b/apps/leo_manager/include/leo_manager.hrl
@@ -320,6 +320,7 @@
 -define(ERROR_FAIL_TO_UPDATE_ACL, "Fail to update acl of a bucket").
 -define(ERROR_FAIL_ACCESS_MNESIA, "Fail to access mnesia").
 -define(ERROR_ALREADY_HAS_SAME_CLUSTER, "Already has a same neme of cluster").
+-define(ERROR_INCOMPATIBLE_VERSION, "Incompatible Version").
 -define(ERROR_COULD_NOT_GET_CLUSTER_INFO,"Could not get cluster info").
 -define(ERROR_OVER_MAX_CLUSTERS, "Over max number of clusters").
 -define(ERROR_CLUSTER_NOT_FOUND, "Cluster not found").

diff --git a/apps/leo_manager/rebar.config b/apps/leo_manager/rebar.config
@@ -25,8 +25,8 @@
 {deps, [
         {leo_commons,           ".*", {git, "https://github.com/leo-project/leo_commons.git",           {tag, "1.1.11"}}},
         {leo_logger,            ".*", {git, "https://github.com/leo-project/leo_logger.git",            {tag, "1.3.3"}}},
-        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.19"}}},
-        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.51"}}},
+        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.20"}}},
+        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.53"}}},
         {leo_rpc,               ".*", {git, "https://github.com/leo-project/leo_rpc.git",               {tag, "0.10.14"}}},
         {leo_statistics,        ".*", {git, "https://github.com/leo-project/leo_statistics.git",        {tag, "1.1.19"}}},
         {leo_s3_libs,           ".*", {git, "https://github.com/leo-project/leo_s3_libs.git",           {tag, "1.2.15"}}},

diff --git a/apps/leo_manager/src/leo_manager_api.erl b/apps/leo_manager/src/leo_manager_api.erl
@@ -2408,6 +2408,9 @@ call_gateway_api(Method, Args) ->
 %% @doc Join a cluster (MDC-Replication)
 -spec(join_cluster([atom()], #?SYSTEM_CONF{}) ->
              {ok, #?SYSTEM_CONF{}} | {error, any()}).
+%% @doc Convert System Conf from ~1.3.2 cluster
+join_cluster(RemoteManagerNodes, #system_conf_2{} = SystemConf) ->
+    join_cluster(RemoteManagerNodes, leo_cluster_tbl_conf:transform(SystemConf));
 join_cluster(RemoteManagerNodes,
              #?SYSTEM_CONF{cluster_id = ClusterId,
                            dc_id = DCId,
@@ -2439,7 +2442,11 @@ join_cluster(RemoteManagerNodes,
             {error, ?ERROR_ALREADY_HAS_SAME_CLUSTER};
         Error ->
             Error
-    end.
+    end;
+join_cluster(RemoteManagerNodes, _) ->
+    ?error("join_cluster/2", [{cause, ?ERROR_INCOMPATIBLE_VERSION},
+                              {nodes, RemoteManagerNodes}]),
+    {error, ?ERROR_INCOMPATIBLE_VERSION}.
 
 
 %% @doc Synchronize mdc-related tables

diff --git a/apps/leo_storage/rebar.config b/apps/leo_storage/rebar.config
@@ -25,10 +25,10 @@
 {deps, [
         {leo_commons,           ".*", {git, "https://github.com/leo-project/leo_commons.git",           {tag, "1.1.11"}}},
         {leo_logger,            ".*", {git, "https://github.com/leo-project/leo_logger.git",            {tag, "1.3.3"}}},
-        {leo_mq,                ".*", {git, "https://github.com/leo-project/leo_mq.git",                {tag, "1.5.9"}}},
-        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.19"}}},
+        {leo_mq,                ".*", {git, "https://github.com/leo-project/leo_mq.git",                {tag, "1.5.11"}}},
+        {leo_object_storage,    ".*", {git, "https://github.com/leo-project/leo_object_storage.git",    {tag, "1.3.20"}}},
         {leo_ordning_reda,      ".*", {git, "https://github.com/leo-project/leo_ordning_reda.git",      {tag, "1.2.7"}}},
-        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.51"}}},
+        {leo_redundant_manager, ".*", {git, "https://github.com/leo-project/leo_redundant_manager.git", {tag, "1.9.53"}}},
         {leo_rpc,               ".*", {git, "https://github.com/leo-project/leo_rpc.git",               {tag, "0.10.14"}}},
         {leo_statistics,        ".*", {git, "https://github.com/leo-project/leo_statistics.git",        {tag, "1.1.19"}}},
         {leo_watchdog,          ".*", {git, "https://github.com/leo-project/leo_watchdog.git",          {tag, "1.0.3"}}},