You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2018/03/12 11:41:09 UTC
[kafka] branch trunk updated: MINOR: Revert to ZooKeeper 3.4.10 due
to ZOOKEEPER-2960 (#4678)
This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 825bfe5 MINOR: Revert to ZooKeeper 3.4.10 due to ZOOKEEPER-2960 (#4678)
825bfe5 is described below
commit 825bfe5adefe4b5f967068b332cb0feedd7dc4fc
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Mon Mar 12 04:40:59 2018 -0700
MINOR: Revert to ZooKeeper 3.4.10 due to ZOOKEEPER-2960 (#4678)
It's a critical bug that only affects the server, but we
don't have an easy way to use 3.4.11 for the client
only.
Reviewers: Jun Rao <ju...@gmail.com>, Damian Guy <da...@gmail.com>
---
core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala | 3 ++-
core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala | 3 ++-
gradle/dependencies.gradle | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
index 596c353..5e33816 100755
--- a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
+++ b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
@@ -23,6 +23,7 @@ import kafka.utils.TestUtils._
import kafka.api.FetchRequestBuilder
import kafka.message.ByteBufferMessageSet
import java.io.File
+import java.net.UnknownHostException
import kafka.log.LogManager
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord}
@@ -130,7 +131,7 @@ class ServerShutdownTest extends ZooKeeperTestHarness {
val newProps = TestUtils.createBrokerConfig(0, zkConnect)
newProps.setProperty("zookeeper.connect", "some.invalid.hostname.foo.bar.local:65535")
val newConfig = KafkaConfig.fromProps(newProps)
- verifyCleanShutdownAfterFailedStartup[IllegalArgumentException](newConfig)
+ verifyCleanShutdownAfterFailedStartup[UnknownHostException](newConfig)
}
@Test
diff --git a/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala b/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
index 77e11ea..4eb9e67 100644
--- a/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
+++ b/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
@@ -16,6 +16,7 @@
*/
package kafka.zookeeper
+import java.net.UnknownHostException
import java.nio.charset.StandardCharsets
import java.util.UUID
import java.util.concurrent.atomic.AtomicBoolean
@@ -57,7 +58,7 @@ class ZooKeeperClientTest extends ZooKeeperTestHarness {
System.clearProperty(JaasUtils.JAVA_LOGIN_CONFIG_PARAM)
}
- @Test(expected = classOf[IllegalArgumentException])
+ @Test(expected = classOf[UnknownHostException])
def testUnresolvableConnectString(): Unit = {
new ZooKeeperClient("some.invalid.hostname.foo.bar.local", -1, -1, Int.MaxValue, time, "testMetricGroup",
"testMetricType").close()
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2ac496b..b7a03dc 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -71,7 +71,7 @@ versions += [
slf4j: "1.7.25",
snappy: "1.1.7.1",
zkclient: "0.10",
- zookeeper: "3.4.11",
+ zookeeper: "3.4.10",
jfreechart: "1.0.0",
mavenArtifact: "3.5.2"
]
--
To stop receiving notification emails like this one, please contact
ijuma@apache.org.