Skip to content

Commit

Permalink
MINOR: Revert to ZooKeeper 3.4.10 due to ZOOKEEPER-2960 (#4678)
Browse files Browse the repository at this point in the history
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 <junrao@gmail.com>, Damian Guy <damian.guy@gmail.com>
  • Loading branch information
ijuma committed Mar 12, 2018
1 parent c28c556 commit 825bfe5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down

0 comments on commit 825bfe5

Please sign in to comment.