kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject kafka git commit: KAFKA-1723; num.partitions documented default is 1 while actual default is 2; patched by Manikumar Reddy; reviewed by Jun Rao
Date Mon, 19 Jan 2015 16:44:58 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 09234f0e5 -> 49d7f8ee1


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/49d7f8ee
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/49d7f8ee
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/49d7f8ee

Branch: refs/heads/trunk
Commit: 49d7f8ee1cd96a99f44ac48043db9ad8a5336c7d
Parents: 09234f0
Author: Manikumar Reddy <manikumar.reddy@gmail.com>
Authored: Mon Jan 19 08:44:53 2015 -0800
Committer: Jun Rao <junrao@gmail.com>
Committed: Mon Jan 19 08:44:53 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/49d7f8ee/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/49d7f8ee/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 88689df..6d74983 100644
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -100,7 +100,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 */


Mime
View raw message