Skip to content

HBASE-25700 Enhance znode parent validation when add_peer #3458

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

Merged
Apache9 merged 8 commits into from
Jul 11, 2021
Merged

HBASE-25700 Enhance znode parent validation when add_peer #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4ad68d
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 3, 2021
bfabb4b
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 4, 2021
c40df56
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 4, 2021
b7c7750
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 4, 2021
e963201
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 5, 2021
ecc2dec
Update ReplicationPeerConfig.java
mokai87 Jul 6, 2021
5a88b74
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 6, 2021
51f757d
HBASE-25700 Enhance znode parent validation when add_peer
mokai87 Jul 8, 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
2 changes: 1 addition & 1 deletion hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static class ReplicationPeerConfigBuilderImpl implements ReplicationPeerConfigBu

@Override
public ReplicationPeerConfigBuilder setClusterKey(String clusterKey) {
this.clusterKey = clusterKey;
this.clusterKey = clusterKey != null ? clusterKey.trim() : null;
return this;
}

Expand Down
8 changes: 8 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,14 @@ public void testInvalidClusterKey() throws InterruptedException {
}
}

@Test
public void testClusterKeyWithTrailingSpace() throws Exception {
admin.addReplicationPeer(ID_ONE,
ReplicationPeerConfig.newBuilder().setClusterKey(KEY_ONE + " ").build()).get();
String clusterKey = admin.getReplicationPeerConfig(ID_ONE).get().getClusterKey();
assertEquals(KEY_ONE, clusterKey);
}

@Test
public void testInvalidReplicationEndpoint() throws InterruptedException {
try {
Expand Down