From 4065e959610e956c908dc974766349c9c9e63e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8E=AB=E5=87=AF?= Date: Wed, 6 Jan 2021 09:55:52 +0800 Subject: [PATCH 1/3] HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a offline RS to rsgroup --- .../apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java index 9850917e795d..4c3936c97a50 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java @@ -1233,9 +1233,7 @@ public void moveServers(Set
servers, String targetGroupName) throws IOE Address firstServer = servers.iterator().next(); RSGroupInfo srcGrp = 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."); + throw new ConstraintException("Server " + firstServer + " does not exist or offline."); } // Only move online servers (when moving from 'default') or servers from other From fd82f623b29b2350f1e74175b039a5a70d6685d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8E=AB=E5=87=AF?= Date: Wed, 6 Jan 2021 11:00:21 +0800 Subject: [PATCH 2/3] HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a offline RS to rsgroup --- .../apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 1 + .../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java index 4c3936c97a50..7824bfde7e7b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java @@ -1233,6 +1233,7 @@ public void moveServers(Set
servers, String targetGroupName) throws IOE Address firstServer = servers.iterator().next(); RSGroupInfo srcGrp = getRSGroupOfServer(firstServer); if (srcGrp == null) { + // Be careful. This exception message is tested for in TestRSGroupAdmin2... throw new ConstraintException("Server " + firstServer + " does not exist or offline."); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java index 983414236c3b..441d4e5b9721 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java @@ -189,7 +189,7 @@ public void testMoveServers() throws Exception { ADMIN.moveServersToRSGroup(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 does not exist or offline."; String msg = "Expected '" + exp + "' in exception message: "; assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); } @@ -337,7 +337,7 @@ public boolean evaluate() throws Exception { ADMIN.setRSGroup(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 does not exist or offline."; String msg = "Expected '" + exp + "' in exception message: "; assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); } From fa828242646921f9125284197c10102309de254d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8E=AB=E5=87=AF?= Date: Wed, 6 Jan 2021 15:32:56 +0800 Subject: [PATCH 3/3] HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a offline RS to rsgroup --- .../apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java | 3 ++- .../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java index 7824bfde7e7b..3ef9365456fd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java @@ -1234,7 +1234,8 @@ public void moveServers(Set
servers, String targetGroupName) throws IOE RSGroupInfo srcGrp = getRSGroupOfServer(firstServer); if (srcGrp == null) { // Be careful. This exception message is tested for in TestRSGroupAdmin2... - throw new ConstraintException("Server " + firstServer + " does not exist or offline."); + throw new ConstraintException("Server " + firstServer + + " is either offline or it does not exist."); } // Only move online servers (when moving from 'default') or servers from other diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java index 441d4e5b9721..f31e80fa7ee6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java @@ -189,7 +189,7 @@ public void testMoveServers() throws Exception { ADMIN.moveServersToRSGroup(Sets.newHashSet(Address.fromString("foo:9999")), "foo"); fail("Bogus servers shouldn't have been successfully moved."); } catch (IOException ex) { - String exp = "Server foo:9999 does not exist or offline."; + 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)); } @@ -337,7 +337,7 @@ public boolean evaluate() throws Exception { ADMIN.setRSGroup(Sets.newHashSet(tableName), newGroup.getName()); fail("Bogus servers shouldn't have been successfully moved."); } catch (IOException ex) { - String exp = "Server foo:9999 does not exist or offline."; + 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)); }