upgrade finagle and querulous

twitter-archive · Jun 6, 2011 · c15a395 · c15a395
1 parent 2200348
commit c15a395
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/project/build/GizzardProject.scala b/project/build/GizzardProject.scala
@@ -9,18 +9,17 @@ with SubversionPublisher {
   override def filterScalaJars = false
   val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
 
-  val querulous  = "com.twitter" % "querulous" % "2.1.4"
+  val querulous  = "com.twitter" % "querulous" % "2.2.0"
 
   //val kestrel     = "net.lag" % "kestrel" % "1.2.7"
   // remove when moved to libkestrel
   val twitterActors = "com.twitter" % "twitteractors_2.8.0" % "2.0.1"
 
-  val finagleThrift   = "com.twitter" % "finagle-thrift"   % "1.3.2"
-  val finagleOstrich4 = "com.twitter" % "finagle-ostrich4" % "1.3.2"
-
-  val thrift     = "thrift" % "libthrift" % "0.5.0"
-  val jackson    = "org.codehaus.jackson" % "jackson-core-asl"   % "1.6.7"
-  val jacksonMap = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.6.7"
+  val finagleThrift   = "com.twitter"          % "finagle-thrift"     % "1.5.1"
+  val finagleOstrich4 = "com.twitter"          % "finagle-ostrich4"   % "1.5.1"
+  val thrift          = "thrift"               % "libthrift"          % "0.5.0"
+  val jackson         = "org.codehaus.jackson" % "jackson-core-asl"   % "1.6.7"
+  val jacksonMap      = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.6.7"
 
   val slf4j      = "org.slf4j" % "slf4j-jdk14" % "1.5.2" //intransitive
   val slf4jApi   = "org.slf4j" % "slf4j-api"   % "1.5.2" //intransitive

diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
@@ -2,6 +2,6 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   val twttrRepo = "twitter.com" at "http://maven.twttr.com"
-  val defaultProject = "com.twitter" % "standard-project" % "0.11.33-NEST"
-  val sbtThrift      = "com.twitter" % "sbt-thrift"       % "1.3.12"
+  val defaultProject = "com.twitter" % "standard-project" % "0.12.7"
+  val sbtThrift      = "com.twitter" % "sbt-thrift"       % "1.4.2"
 }
diff --git a/src/main/scala/com/twitter/gizzard/nameserver/JobRelay.scala b/src/main/scala/com/twitter/gizzard/nameserver/JobRelay.scala
@@ -64,8 +64,9 @@ class JobRelayCluster(
   retries: Int)
 extends (Iterable[Array[Byte]] => Unit) {
   val client = new JobInjector.ServiceToClient(ClientBuilder()
-      .hosts(hosts.map { h => new InetSocketAddress(h.hostname, h.port) })
       .codec(ThriftClientFramedCodec())
+      .hosts(hosts.map { h => new InetSocketAddress(h.hostname, h.port) })
+      .hostConnectionLimit(2)
       .retries(retries)
       .connectionTimeout(timeout)
       .requestTimeout(timeout)

diff --git a/src/test/scala/com/twitter/gizzard/ConfiguredSpecification.scala b/src/test/scala/com/twitter/gizzard/ConfiguredSpecification.scala
@@ -77,8 +77,9 @@ trait IntegrationSpecification extends Specification {
     val i = s.enum
     val port = 8000 + (i - 1) * 3
     val client = new testserver.thrift.TestServer.ServiceToClient(ClientBuilder()
-        .hosts(new InetSocketAddress("localhost", port))
         .codec(ThriftClientFramedCodec())
+        .hosts(new InetSocketAddress("localhost", port))
+        .hostConnectionLimit(1)
         .build(),
         new TBinaryProtocol.Factory())