You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2015/01/19 17:44:09 UTC

kafka git commit: KAFKA-1723; num.partitions documented default is 1 while actual default is 2; patched by Manikumar Reddy; reviewed by Jun Rao

Repository: kafka
Updated Branches:
  refs/heads/0.8.2 86a8bc2b0 -> 7013b2639


KAFKA-1723; num.partitions documented default is 1 while actual default is 2; patched by Manikumar Reddy; reviewed by Jun Rao


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7013b263
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7013b263
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7013b263

Branch: refs/heads/0.8.2
Commit: 7013b2639eda1ef3e7b2d794bf8513ba40ef34bf
Parents: 86a8bc2
Author: Manikumar Reddy <ma...@gmail.com>
Authored: Mon Jan 19 08:43:57 2015 -0800
Committer: Jun Rao <ju...@gmail.com>
Committed: Mon Jan 19 08:43:57 2015 -0800

----------------------------------------------------------------------
 config/server.properties                           | 4 ++--
 core/src/main/scala/kafka/server/KafkaConfig.scala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/7013b263/config/server.properties
----------------------------------------------------------------------
diff --git a/config/server.properties b/config/server.properties
index b0e4496..1614260 100644
--- a/config/server.properties
+++ b/config/server.properties
@@ -46,7 +46,7 @@ num.io.threads=8
 socket.send.buffer.bytes=102400
 
 # The receive buffer (SO_RCVBUF) used by the socket server
-socket.receive.buffer.bytes=65536
+socket.receive.buffer.bytes=102400
 
 # The maximum size of a request that the socket server will accept (protection against OOM)
 socket.request.max.bytes=104857600
@@ -118,4 +118,4 @@ log.cleaner.enable=false
 zookeeper.connect=localhost:2181
 
 # Timeout in ms for connecting to zookeeper
-zookeeper.connection.timeout.ms=2000
+zookeeper.connection.timeout.ms=6000

http://git-wip-us.apache.org/repos/asf/kafka/blob/7013b263/core/src/main/scala/kafka/server/KafkaConfig.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index e3396ad..e5fecae 100644
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -92,7 +92,7 @@ class KafkaConfig private (val props: VerifiableProperties) extends ZKConfig(pro
   /*********** Socket Server Configuration ***********/
 
   /* the port to listen and accept connections on */
-  val port: Int = props.getInt("port", 6667)
+  val port: Int = props.getInt("port", 9092)
 
   /* hostname of broker. If this is set, it will only bind to this address. If this is not set,
    * it will bind to all interfaces */