Merge pull request #240 from Shopify/tighten-config-validation

producer: check MaxMessagesPerReq >= FlushMsgCount
IBM · Dec 19, 2014 · 950d619 · 950d619
2 parents 03ad601 + 4a244b5
commit 950d619
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/producer.go b/producer.go
@@ -75,8 +75,8 @@ func (config *ProducerConfig) Validate() error {
 		Logger.Println("ProducerConfig.MaxMessageBytes too close to MaxRequestSize; it will be ignored.")
 	}
 
-	if config.MaxMessagesPerReq < 0 {
-		return ConfigurationError("Invalid MaxMessagesPerReq")
+	if config.MaxMessagesPerReq < 0 || (config.MaxMessagesPerReq > 0 && config.MaxMessagesPerReq < config.FlushMsgCount) {
+		return ConfigurationError("Invalid MaxMessagesPerReq, must be non-negative and >= FlushMsgCount if set")
 	}
 
 	if config.RetryBackoff < 0 {

diff --git a/vagrant/install_cluster.sh b/vagrant/install_cluster.sh
@@ -6,7 +6,7 @@ KAFKA_VERSION=0.8.1.1
 
 mkdir -p ${KAFKA_INSTALL_ROOT}
 if [ ! -f ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz ]; then
-    wget --quiet http://apache.mirror.nexicom.net/kafka/${KAFKA_VERSION}/kafka_2.10-${KAFKA_VERSION}.tgz -O ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz
+    wget --quiet http://apache.mirror.gtcomm.net/kafka/${KAFKA_VERSION}/kafka_2.10-${KAFKA_VERSION}.tgz -O ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz
 fi
 
 for i in 1 2 3 4 5; do