You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/10/04 00:05:40 UTC
git commit: HBASE-12167 addendum; fix TestMasterObserver
Repository: hbase
Updated Branches:
refs/heads/master efe0787c8 -> dbef2bdaf
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/dbef2bda
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dbef2bda
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dbef2bda
Branch: refs/heads/master
Commit: dbef2bdafe5500c0abc8fc61d3539d3b7a2132b9
Parents: efe0787
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Fri Oct 3 15:02:41 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Fri Oct 3 15:02:41 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/dbef2bda/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 e4fe3ae..0e54782 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
@@ -1428,11 +1428,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;