Skip to content

Commit 165e29f

Browse files
committed
Log zk retry, reduce default to 10
1 parent d5c3c0c commit 165e29f

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

app/kafka/manager/base/CuratorAwareActor.scala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,22 @@
55

66
package kafka.manager.base
77

8+
import akka.actor.ActorLogging
89
import kafka.manager.model.CuratorConfig
10+
import org.apache.curator.RetrySleeper
911
import org.apache.curator.framework.{CuratorFramework, CuratorFrameworkFactory}
1012
import org.apache.curator.retry.BoundedExponentialBackoffRetry
1113

1214
import scala.util.Try
1315

16+
class LoggingRetryPolicy(curatorConfig: CuratorConfig, actorLogging: ActorLogging
17+
) extends BoundedExponentialBackoffRetry(curatorConfig.baseSleepTimeMs
18+
, curatorConfig.maxSleepTimeMs, curatorConfig.zkMaxRetry) {
19+
override def allowRetry(retryCount: Int, elapsedTimeMs: Long, sleeper: RetrySleeper): Boolean = {
20+
actorLogging.log.info(s"retryCount=$retryCount maxRetries=${curatorConfig.zkMaxRetry} zkConnect=${curatorConfig.zkConnect}")
21+
super.allowRetry(retryCount, elapsedTimeMs, sleeper)
22+
}
23+
}
1424

1525
trait CuratorAwareActor extends BaseActor {
1626

@@ -23,7 +33,7 @@ trait CuratorAwareActor extends BaseActor {
2333
protected def getCurator(config: CuratorConfig) : CuratorFramework = {
2434
val curator: CuratorFramework = CuratorFrameworkFactory.newClient(
2535
config.zkConnect,
26-
new BoundedExponentialBackoffRetry(config.baseSleepTimeMs, config.maxSleepTimeMs, config.zkMaxRetry))
36+
new LoggingRetryPolicy(config, this))
2737
curator
2838
}
2939

app/kafka/manager/model/model.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import scalaz.Validation.FlatMap._
1616
/**
1717
* @author hiral
1818
*/
19-
case class CuratorConfig(zkConnect: String, zkMaxRetry: Int = 100, baseSleepTimeMs : Int = 100, maxSleepTimeMs: Int = 1000)
19+
case class CuratorConfig(zkConnect: String, zkMaxRetry: Int = 10, baseSleepTimeMs : Int = 100, maxSleepTimeMs: Int = 1000)
2020

2121
sealed trait KafkaVersion
2222
case object Kafka_0_8_1_1 extends KafkaVersion {
@@ -185,7 +185,7 @@ object ClusterConfig {
185185
def apply(name: String
186186
, version : String
187187
, zkHosts: String
188-
, zkMaxRetry: Int = 100
188+
, zkMaxRetry: Int = 10
189189
, jmxEnabled: Boolean
190190
, jmxUser: Option[String]
191191
, jmxPass: Option[String]

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name := """cmak"""
66

77
/* For packaging purposes, -SNAPSHOT MUST contain a digit */
8-
version := "3.0.0.1"
8+
version := "3.0.0.2"
99

1010
scalaVersion := "2.12.10"
1111

0 commit comments

Comments
 (0)