Repository: kudu Updated Branches: refs/heads/branch-1.7.x 2a8893e3e -> cf21f3673
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 <wdberke...@gmail.com> Tested-by: Kudu Jenkins (cherry picked from commit 7aab411d3187ea066c935af0215f894c5eca6aae) Reviewed-on: http://gerrit.cloudera.org:8080/11033 Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/cf21f367 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/cf21f367 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/cf21f367 Branch: refs/heads/branch-1.7.x Commit: cf21f36730dfa1567174e1be623c645cef1e6c38 Parents: 2a8893e Author: Attila Bukor <abu...@apache.org> Authored: Tue Jul 24 16:11:26 2018 +0200 Committer: Attila Bukor <abu...@apache.org> Committed: Mon Jul 30 16:41:10 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/cf21f367/src/kudu/master/sys_catalog.cc ---------------------------------------------------------------------- diff --git a/src/kudu/master/sys_catalog.cc b/src/kudu/master/sys_catalog.cc index 355b8f6..9f1861d 100644 --- a/src/kudu/master/sys_catalog.cc +++ b/src/kudu/master/sys_catalog.cc @@ -219,8 +219,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); }
