Repository: hbase Updated Branches: refs/heads/branch-1 6b95b4a8a -> 51ef41853
HBASE-12167 addendum; fix TestMasterObserver Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/51ef4185 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/51ef4185 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/51ef4185 Branch: refs/heads/branch-1 Commit: 51ef4185347b651d08a1abe9db74544b4113791a Parents: 6b95b4a Author: Jimmy Xiang <[email protected]> Authored: Fri Oct 3 15:02:41 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Fri Oct 3 15:08:04 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/51ef4185/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java index 79acf4c..0a2d638 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java @@ -1377,11 +1377,13 @@ public class TestMasterObserver { String destName = null; String serverNameForFirstRegion = firstGoodPair.getValue().toString(); LOG.info("serverNameForFirstRegion=" + serverNameForFirstRegion); + ServerName masterServerName = master.getServerName(); boolean found = false; // Find server that is NOT carrying the first region for (ServerName info : servers) { LOG.info("ServerName=" + info); - if (!serverNameForFirstRegion.equals(info.getServerName())) { + if (!serverNameForFirstRegion.equals(info.getServerName()) + && !masterServerName.equals(info)) { destName = info.toString(); found = true; break;
