kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abu...@apache.org
Subject kudu git commit: KUDU-2510 Fix symmetric difference logging
Date Tue, 24 Jul 2018 15:39:40 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 5b09a693d -> 7aab411d3


KUDU-2510 Fix symmetric difference logging

When the on-disk and provided master_addresses don't match, the error
message was misleading as it showed them swapped, i.e. the
--master_addresses lists 3 masters, and there's 1 in the Raft config, it
showed "on-disk master list (master1:7051, master2:7051, master3:7051)
and provided master list (master1:7051) differ."

This commit swaps these two lists.

Change-Id: I1fd5a0aaa5bd1398d874a8526240b12c37baad70
Reviewed-on: http://gerrit.cloudera.org:8080/11031
Reviewed-by: Will Berkeley <wdberkeley@gmail.com>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/7aab411d
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/7aab411d
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/7aab411d

Branch: refs/heads/master
Commit: 7aab411d3187ea066c935af0215f894c5eca6aae
Parents: 5b09a69
Author: Attila Bukor <abukor@apache.org>
Authored: Tue Jul 24 16:11:26 2018 +0200
Committer: Attila Bukor <abukor@apache.org>
Committed: Tue Jul 24 15:39:17 2018 +0000

----------------------------------------------------------------------
 src/kudu/master/sys_catalog.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/7aab411d/src/kudu/master/sys_catalog.cc
----------------------------------------------------------------------
diff --git a/src/kudu/master/sys_catalog.cc b/src/kudu/master/sys_catalog.cc
index dd36fae..01b18f1 100644
--- a/src/kudu/master/sys_catalog.cc
+++ b/src/kudu/master/sys_catalog.cc
@@ -221,8 +221,8 @@ Status SysCatalogTable::Load(FsManager *fs_manager) {
       string msg = Substitute(
           "on-disk master list ($0) and provided master list ($1) differ. "
           "Their symmetric difference is: $2",
-          JoinStrings(peer_addrs_from_opts, ", "),
           JoinStrings(peer_addrs_from_disk, ", "),
+          JoinStrings(peer_addrs_from_opts, ", "),
           JoinStrings(symm_diff, ", "));
       return Status::InvalidArgument(msg);
     }


Mime
View raw message