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

HBASE 13796 - Fixed ZKUtil's cleaning of the zookeeper quorum setting 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Geoffrey 2015-05-28 14:33:19 -07:00 committed by stack
parent 423499fbfb
commit ffcd4d424f
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
View File

@ -381,8 +381,8 @@ public class ZKUtil {
* @return ensemble key with a name (if any) * @return ensemble key with a name (if any)
*/ */
public static String getZooKeeperClusterKey(Configuration conf, String name) { public static String getZooKeeperClusterKey(Configuration conf, String name) {
String ensemble = conf.get(HConstants.ZOOKEEPER_QUORUM.replaceAll( String ensemble = conf.get(HConstants.ZOOKEEPER_QUORUM).replaceAll(
"[\\t\\n\\x0B\\f\\r]", "")); "[\\t\\n\\x0B\\f\\r]", "");
StringBuilder builder = new StringBuilder(ensemble); StringBuilder builder = new StringBuilder(ensemble);
builder.append(":"); builder.append(":");
builder.append(conf.get(HConstants.ZOOKEEPER_CLIENT_PORT)); builder.append(conf.get(HConstants.ZOOKEEPER_CLIENT_PORT));

43
hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKUtil.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright 2015 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.zookeeper;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
/**
*
*/
@Category({SmallTests.class})
public class TestZKUtil {
@Test
public void testGetZooKeeperClusterKey() {
Configuration conf = HBaseConfiguration.create();
conf.set(HConstants.ZOOKEEPER_QUORUM, "\tlocalhost\n");
conf.set(HConstants.ZOOKEEPER_CLIENT_PORT, "3333");
conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "hbase");
String clusterKey = ZKUtil.getZooKeeperClusterKey(conf, "test");
Assert.assertTrue(!clusterKey.contains("\t") && !clusterKey.contains("\n"));
Assert.assertEquals("localhost:3333:hbase,test", clusterKey);
}
}