Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a offline RS to rsgroup (#2846) 

Signed-off-by: Viraj Jasani <vjasani@apache.org>
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
This commit is contained in:
mokai 2021-01-06 22:27:58 +08:00 committed by GitHub
parent bedb45d4ac
commit a414361ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View File

@ -1233,9 +1233,9 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager {
Address firstServer = servers.iterator().next(); Address firstServer = servers.iterator().next();
RSGroupInfo srcGrp = getRSGroupOfServer(firstServer); RSGroupInfo srcGrp = getRSGroupOfServer(firstServer);
if (srcGrp == null) { if (srcGrp == null) {
// Be careful. This exception message is tested for in TestRSGroupsBase... // Be careful. This exception message is tested for in TestRSGroupAdmin2...
throw new ConstraintException("Source RSGroup for server " + firstServer throw new ConstraintException("Server " + firstServer
+ " does not exist."); + " is either offline or it does not exist.");
} }
// Only move online servers (when moving from 'default') or servers from other // Only move online servers (when moving from 'default') or servers from other

4
hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java
View File

@ -189,7 +189,7 @@ public class TestRSGroupsAdmin2 extends TestRSGroupsBase {
ADMIN.moveServersToRSGroup(Sets.newHashSet(Address.fromString("foo:9999")), "foo"); ADMIN.moveServersToRSGroup(Sets.newHashSet(Address.fromString("foo:9999")), "foo");
fail("Bogus servers shouldn't have been successfully moved."); fail("Bogus servers shouldn't have been successfully moved.");
} catch (IOException ex) { } 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: "; String msg = "Expected '" + exp + "' in exception message: ";
assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp));
} }
@ -337,7 +337,7 @@ public class TestRSGroupsAdmin2 extends TestRSGroupsBase {
ADMIN.setRSGroup(Sets.newHashSet(tableName), newGroup.getName()); ADMIN.setRSGroup(Sets.newHashSet(tableName), newGroup.getName());
fail("Bogus servers shouldn't have been successfully moved."); fail("Bogus servers shouldn't have been successfully moved.");
} catch (IOException ex) { } 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: "; String msg = "Expected '" + exp + "' in exception message: ";
assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp)); assertTrue(msg + " " + ex.getMessage(), ex.getMessage().contains(exp));
} }