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 2013/10/08 22:13:14 UTC
[1/4] git commit: kafka-1069;
MBean kafka.cluster.Partition report wrong UnderReplicated status;
patched by Jun Rao; reviewed by Neha Narkhede
Updated Branches:
refs/heads/trunk bfc4ba499 -> 343a1e266
kafka-1069; MBean kafka.cluster.Partition report wrong UnderReplicated status; patched by Jun Rao; reviewed by Neha Narkhede
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/f53fe183
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/f53fe183
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/f53fe183
Branch: refs/heads/trunk
Commit: f53fe18361a434c388e88b0eed90b8faa0983fd8
Parents: 1cb2175
Author: Jun Rao <ju...@gmail.com>
Authored: Tue Oct 8 09:12:28 2013 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Tue Oct 8 09:12:28 2013 -0700
----------------------------------------------------------------------
core/src/main/scala/kafka/cluster/Partition.scala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/f53fe183/core/src/main/scala/kafka/cluster/Partition.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/cluster/Partition.scala b/core/src/main/scala/kafka/cluster/Partition.scala
index a9bb3c8..60f3ed4 100644
--- a/core/src/main/scala/kafka/cluster/Partition.scala
+++ b/core/src/main/scala/kafka/cluster/Partition.scala
@@ -69,7 +69,12 @@ class Partition(val topic: String,
def isUnderReplicated(): Boolean = {
leaderIsrUpdateLock synchronized {
- inSyncReplicas.size < replicationFactor
+ leaderReplicaIfLocal() match {
+ case Some(_) =>
+ inSyncReplicas.size < replicationFactor
+ case None =>
+ false
+ }
}
}
[3/4] git commit: kafka-954;
tidy up README file for better general availability; patched by Jun Rao;
reviewed by Joe Stein and Neha Narkhede
Posted by ju...@apache.org.
kafka-954; tidy up README file for better general availability; patched by Jun Rao; reviewed by Joe Stein and Neha Narkhede
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b384c27c
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b384c27c
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b384c27c
Branch: refs/heads/trunk
Commit: b384c27c33dc12d466b4e432b03faea5f88b55aa
Parents: a6904a2
Author: Jun Rao <ju...@gmail.com>
Authored: Tue Oct 8 13:04:12 2013 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Tue Oct 8 13:04:12 2013 -0700
----------------------------------------------------------------------
README.md | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/b384c27c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9879427..10b8d25 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,30 @@
# Apache Kafka #
-See our [web site](http://kafka.apache.org) details on the project.
+See our [web site](http://kafka.apache.org) for details on the project.
-## Building It ##
+## Building it ##
+1. ./sbt update
+2. ./sbt package
+3. ./sbt assembly-package-dependency
-To build for all supported versions of Scala:
-1. ./sbt +package
+To build for a particular version of Scala (either 2.8.0, 2.8.2, 2.9.1, 2.9.2 or 2.10.1), change step 2 above to:
+2. ./sbt "++2.8.0 package"
-To build for a particular version of Scala (either 2.8.0, 2.8.2, 2.9.1 or 2.9.2):
+To build for all supported versions of Scala, change step 2 above to:
+2. ./sbt +package
-1. ./sbt "++2.8.0 package" *or* ./sbt "++2.8.2 package" *or* ./sbt "++2.9.1 package" *or* ./sbt "++2.9.2 package"
+## Running it ##
+Follow instuctions in http://kafka.apache.org/documentation.html#quickstart
-## Running It ##
+## Running unit tests ##
+ ./sbt test
-To run follow the instructions here:
-1. http://kafka.apache.org/08/quickstart.html
+## Building a binary release zip or gzipped tar ball ##
+ ./sbt release-zip
+ ./sbt release-tar
+The release file can be found inside ./target/RELEASE/.
## Other Build Tips ##
-
Here are some useful sbt commands, to be executed at the sbt command prompt (./sbt). Prefixing with "++<version> " runs the
command for a specific Scala version, prefixing with "+" will perform the action for all versions of Scala, and no prefix
runs the command for the default (2.8.0) version of Scala. -
@@ -27,6 +34,7 @@ clean : Deletes all generated files (the target directory).
compile : Compile all the sub projects, but not create the jars
test : Run all unit tests in all sub projects
release-zip : Create all the jars, run unit tests and create a deployable release zip
+release-tar : Create all the jars, run unit tests and create a deployable release gzipped tar tall
package: Creates jars for src, test, docs etc
projects : List all the sub projects
project sub_project_name : Switch to a particular sub-project. For example, to switch to the core kafka code, use "project core-kafka"
[4/4] git commit: Merge remote-tracking branch 'origin/0.8' into trunk
Posted by ju...@apache.org.
Merge remote-tracking branch 'origin/0.8' into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/343a1e26
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/343a1e26
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/343a1e26
Branch: refs/heads/trunk
Commit: 343a1e2660aa7c3c847c459360a5fbbcb065c759
Parents: bfc4ba4 b384c27
Author: Jun Rao <ju...@gmail.com>
Authored: Tue Oct 8 13:05:40 2013 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Tue Oct 8 13:05:40 2013 -0700
----------------------------------------------------------------------
README.md | 28 +++++++++++++-------
.../main/scala/kafka/cluster/Partition.scala | 7 ++++-
system_test/utils/kafka_system_test_utils.py | 14 +++++++---
3 files changed, 34 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/343a1e26/core/src/main/scala/kafka/cluster/Partition.scala
----------------------------------------------------------------------
[2/4] git commit: kafka-1078;
Update System Test to handle controller data returned by ZK;
patched by John Fung; reviewed by Jun Rao
Posted by ju...@apache.org.
kafka-1078; Update System Test to handle controller data returned by ZK; patched by John Fung; 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/a6904a26
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a6904a26
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a6904a26
Branch: refs/heads/trunk
Commit: a6904a2644a95a3d8d2a59e3915a76e7ee43557a
Parents: f53fe18
Author: John Fung <fu...@gmail.com>
Authored: Tue Oct 8 09:22:32 2013 -0700
Committer: Jun Rao <ju...@gmail.com>
Committed: Tue Oct 8 09:22:32 2013 -0700
----------------------------------------------------------------------
system_test/utils/kafka_system_test_utils.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/a6904a26/system_test/utils/kafka_system_test_utils.py
----------------------------------------------------------------------
diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py
index 1b473eb..aec31cb 100644
--- a/system_test/utils/kafka_system_test_utils.py
+++ b/system_test/utils/kafka_system_test_utils.py
@@ -1878,10 +1878,16 @@ def get_controller_attributes(systemTestEnv, testcaseEnv):
logger.debug("executing command [" + cmdStr + "]", extra=d)
subproc = system_test_utils.sys_call_return_subproc(cmdStr)
for line in subproc.stdout.readlines():
- brokerid = line.rstrip('\n')
- controllerDict["brokerid"] = brokerid
- controllerDict["entity_id"] = system_test_utils.get_data_by_lookup_keyval(
- tcConfigsList, "broker.id", brokerid, "entity_id")
+ if "brokerid" in line:
+ json_str = line.rstrip('\n')
+ json_data = json.loads(json_str)
+ brokerid = str(json_data["brokerid"])
+ controllerDict["brokerid"] = brokerid
+ controllerDict["entity_id"] = system_test_utils.get_data_by_lookup_keyval(
+ tcConfigsList, "broker.id", brokerid, "entity_id")
+ else:
+ pass
+
return controllerDict
def getMinCommonStartingOffset(systemTestEnv, testcaseEnv, clusterName="source"):