You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ra...@apache.org on 2015/09/06 20:02:42 UTC
svn commit: r1701505 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java
Author: rakeshr
Date: Sun Sep 6 18:02:42 2015
New Revision: 1701505
URL: http://svn.apache.org/r1701505
Log:
ZOOKEEPER-2264: Wrong error message when secureClientPortAddress is configured but secureClientPort is not configured (Arshad Mohammad via rakeshr)
Added:
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1701505&r1=1701504&r2=1701505&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Sep 6 18:02:42 2015
@@ -164,6 +164,9 @@ BUGFIXES:
ZOOKEEPER-2256: Zookeeper is not using specified JMX port in zkEnv.sh
(Arshad Mohammad via rakeshr)
+ ZOOKEEPER-2264: Wrong error message when secureClientPortAddress is
+ configured but secureClientPort is not configured (Arshad Mohammad via rakeshr)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=1701505&r1=1701504&r2=1701505&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java Sun Sep 6 18:02:42 2015
@@ -304,7 +304,7 @@ public class QuorumPeerConfig {
if (clientPort == 0) {
LOG.info("clientPort is not set");
- if (this.clientPortAddress != null) {
+ if (clientPortAddress != null) {
throw new IllegalArgumentException("clientPortAddress is set but clientPort is not set");
}
} else if (clientPortAddress != null) {
@@ -318,8 +318,8 @@ public class QuorumPeerConfig {
if (secureClientPort == 0) {
LOG.info("secureClientPort is not set");
- if (this.secureClientPortAddress != null) {
- throw new IllegalArgumentException("clientPortAddress is set but clientPort is not set");
+ if (secureClientPortAddress != null) {
+ throw new IllegalArgumentException("secureClientPortAddress is set but secureClientPort is not set");
}
} else if (secureClientPortAddress != null) {
this.secureClientPortAddress = new InetSocketAddress(
Added: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java?rev=1701505&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java (added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java Sun Sep 6 18:02:42 2015
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.zookeeper.server.quorum;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
+import org.junit.Test;
+
+public class TestQuorumPeerConfig {
+
+ /**
+ * test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2264
+ */
+ @Test
+ public void testErrorMessageWhensecureClientPortNotSetButsecureClientPortAddressSet()
+ throws IOException, ConfigException {
+ QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
+ try {
+ Properties zkProp = getDefaultZKProperties();
+ zkProp.setProperty("secureClientPortAddress", "localhost");
+ quorumPeerConfig.parseProperties(zkProp);
+ fail("IllegalArgumentException is expected");
+ } catch (IllegalArgumentException e) {
+ String expectedMessage = "secureClientPortAddress is set but secureClientPort is not set";
+ assertEquals(expectedMessage, e.getMessage());
+ }
+ }
+
+ /**
+ *
+ * Test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2264
+ */
+ @Test
+ public void testErrorMessageWhenclientPortNotSetButclientPortAddressSet()
+ throws IOException, ConfigException {
+ QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
+ try {
+ Properties zkProp = getDefaultZKProperties();
+ zkProp.setProperty("clientPortAddress", "localhost");
+ quorumPeerConfig.parseProperties(zkProp);
+ fail("IllegalArgumentException is expected");
+ } catch (IllegalArgumentException e) {
+ String expectedMessage = "clientPortAddress is set but clientPort is not set";
+ assertEquals(expectedMessage, e.getMessage());
+ }
+ }
+
+ private Properties getDefaultZKProperties() {
+ Properties zkProp = new Properties();
+ zkProp.setProperty("dataDir", new File("myDataDir").getAbsolutePath());
+ return zkProp;
+ }
+
+}