From d28e310753edfedbf107dedac34844aea404ec21 Mon Sep 17 00:00:00 2001 From: mokai Date: Wed, 6 Jan 2021 22:28:47 +0800 Subject: [PATCH] HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a offline RS to rsgroup (#2847) (#2846) Signed-off-by: Viraj Jasani Signed-off-by: Wellington Chevreuil (cherry picked from commit 821f4221756829473e481495010caf7caf13c8bf) Change-Id: Iaf5eafc91f2b12dc931f80a40954e4cefe026f7a --- .../hadoop/hbase/rsgroup/RSGroupAdminServer.java | 12 ++++++------ .../hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java index be84653759fd..8e654887017f 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java @@ -160,9 +160,9 @@ private void checkServersAndTables(Set
servers, Set tables, Address firstServer = servers.iterator().next(); RSGroupInfo tmpSrcGrp = rsGroupInfoManager.getRSGroupOfServer(firstServer); if (tmpSrcGrp == null) { - // Be careful. This exception message is tested for in TestRSGroupsBase... - throw new ConstraintException("Source RSGroup for server " + firstServer - + " does not exist."); + // Be careful. This exception message is tested for in TestRSGroupsAdmin2... + throw new ConstraintException("Server " + firstServer + + " is either offline or it does not exist."); } RSGroupInfo srcGrp = new RSGroupInfo(tmpSrcGrp); if (srcGrp.getName().equals(targetGroupName)) { @@ -292,9 +292,9 @@ public void moveServers(Set
servers, String targetGroupName) throws IOE Address firstServer = servers.iterator().next(); RSGroupInfo srcGrp = rsGroupInfoManager.getRSGroupOfServer(firstServer); if (srcGrp == null) { - // Be careful. This exception message is tested for in TestRSGroupsBase... - throw new ConstraintException("Source RSGroup for server " + firstServer - + " does not exist."); + // Be careful. This exception message is tested for in TestRSGroupsAdmin2... + throw new ConstraintException("Server " + firstServer + + " is either offline or it does not exist."); } if (srcGrp.getName().equals(targetGroupName)) { throw new ConstraintException("Target RSGroup " + targetGroupName + diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java index d18bb669df41..62ce128a890a 100644 --- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java @@ -181,7 +181,7 @@ public void testMoveServers() throws Exception { rsGroupAdmin.moveServers(Sets.newHashSet(Address.fromString("foo:9999")), "foo"); fail("Bogus servers shouldn't have been successfully moved."); } catch (IOException ex) { - String exp = "Source RSGroup for server foo:9999 does not exist."; + String exp = "Server foo:9999 is either offline or it does not exist."; String msg = "Expected '" + exp + "' in exception message: "; assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); } @@ -329,7 +329,7 @@ public boolean evaluate() throws Exception { Sets.newHashSet(tableName), newGroup.getName()); fail("Bogus servers shouldn't have been successfully moved."); } catch (IOException ex) { - String exp = "Source RSGroup for server foo:9999 does not exist."; + String exp = "Server foo:9999 is either offline or it does not exist."; String msg = "Expected '" + exp + "' in exception message: "; assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); }