Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jan 6, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbec257
Merge pull request #3 from apache/branch-2
mokai87 Jan 6, 2021
1acb6fc
HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a o…
Jan 6, 2021
3e1ca37
HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a o…
Jan 6, 2021
737ea91
HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a o…
Jan 6, 2021
28aa72a
HBASE-24755 [LOG][RSGroup]Error message is confusing while adding a o…
Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ private void checkServersAndTables(Set<Address> servers, Set<TableName> 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);

Expand Down Expand Up @@ -397,9 +397,9 @@ public void moveServers(Set<Address> 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.");
}
// Only move online servers (when moving from 'default') or servers from other
// groups. This prevents bogus servers from entering groups
Expand Down
4 changes: 2 additions & 2 deletions hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,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));
}
Expand Down Expand Up @@ -333,7 +333,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));
}
Expand Down