-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/28769/
-----------------------------------------------------------
(Updated April 5, 2015, 5 a.m.)
Review request for kafka.
Bugs: KAFKA-1809
https://issues.apache.org/jira/browse/KAFKA-1809
Repository: kafka
Description (updated)
-------
forgot rest of patch
merge with trunk
moved ApiVersion to core, fixed SocketServer concurrency issue and other minor
things
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into
broker_ref2
Conflicts:
core/src/main/scala/kafka/server/KafkaApis.scala
core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala
addressing Joel's comments and added support for older versions in
inter.broker.protocol.version to make upgrades from older versions a bit
clearer.
removed SecurityProtocol from core and reused implementation in o.a.k.common
plus other small cleanup fixes
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into
broker_ref2
removed security.protocol config from clients - it is unused at this point.
Fixed issue with ZK registration when PLAINTEXT is not configured
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into
broker_ref2
Conflicts:
core/src/main/scala/kafka/network/SocketServer.scala
core/src/main/scala/kafka/server/KafkaServer.scala
core/src/test/scala/integration/kafka/api/ProducerFailureHandlingTest.scala
core/src/test/scala/integration/kafka/api/ProducerSendTest.scala
core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
core/src/test/scala/unit/kafka/consumer/ConsumerIteratorTest.scala
core/src/test/scala/unit/kafka/integration/FetcherTest.scala
core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala
core/src/test/scala/unit/kafka/integration/TopicMetadataTest.scala
core/src/test/scala/unit/kafka/log/LogTest.scala
core/src/test/scala/unit/kafka/network/SocketServerTest.scala
core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala
core/src/test/scala/unit/kafka/producer/SyncProducerTest.scala
core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala
core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala
core/src/test/scala/unit/kafka/server/LogOffsetTest.scala
core/src/test/scala/unit/kafka/utils/TestUtils.scala
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into
broker_ref2
Diffs (updated)
-----
clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java
fa9daaef66ff7961e1c46cd0cd8fed18a53bccd8
clients/src/main/java/org/apache/kafka/common/protocol/SecurityProtocol.java
PRE-CREATION
clients/src/main/java/org/apache/kafka/common/utils/Utils.java
920b51a6c3c99639fbc9dc065637eeee3c19fabd
clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
c899813d55b9c4786adde3d840f040d6645d27c8
config/server.properties 1614260b71a658b405bb24157c8f12b1f1031aa5
core/src/main/scala/kafka/admin/AdminUtils.scala
b700110f2d7f1ede235af55d8e37e1b5592c6c7d
core/src/main/scala/kafka/admin/TopicCommand.scala
d430e1d342ea35e06863d6a2bc98653fac897db9
core/src/main/scala/kafka/api/ApiVersion.scala PRE-CREATION
core/src/main/scala/kafka/api/ConsumerMetadataResponse.scala
24aaf954dc42e2084454fa5fc9e8f388ea95c756
core/src/main/scala/kafka/api/LeaderAndIsrRequest.scala
4ff7e8f8cc695551dd5d2fe65c74f6b6c571e340
core/src/main/scala/kafka/api/TopicMetadata.scala
0190076df0adf906ecd332284f222ff974b315fc
core/src/main/scala/kafka/api/TopicMetadataResponse.scala
92ac4e687be22e4800199c0666bfac5e0059e5bb
core/src/main/scala/kafka/api/UpdateMetadataRequest.scala
530982e36b17934b8cc5fb668075a5342e142c59
core/src/main/scala/kafka/client/ClientUtils.scala
ebba87f0566684c796c26cb76c64b4640a5ccfde
core/src/main/scala/kafka/cluster/Broker.scala
0060add008bb3bc4b0092f2173c469fce0120be6
core/src/main/scala/kafka/cluster/BrokerEndPoint.scala PRE-CREATION
core/src/main/scala/kafka/cluster/EndPoint.scala PRE-CREATION
core/src/main/scala/kafka/common/BrokerEndPointNotAvailableException.scala
PRE-CREATION
core/src/main/scala/kafka/consumer/ConsumerConfig.scala
9ebbee6c16dc83767297c729d2d74ebbd063a993
core/src/main/scala/kafka/consumer/ConsumerFetcherManager.scala
b9e2bea7b442a19bcebd1b350d39541a8c9dd068
core/src/main/scala/kafka/consumer/ConsumerFetcherThread.scala
152fda5d1dcdf319399fdeeb8457006090ebe56c
core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala
b1cf0db8741e384e4e4119751058ea87b2589e57
core/src/main/scala/kafka/controller/ControllerChannelManager.scala
c582191636f6188c25d62a67ff0315b56f163133
core/src/main/scala/kafka/controller/KafkaController.scala
09fc46d759b74bcdad2d2a610d9c5a93ff02423f
core/src/main/scala/kafka/javaapi/ConsumerMetadataResponse.scala
d281bb31a66fd749ecddfbe38479b6903f436831
core/src/main/scala/kafka/javaapi/TopicMetadata.scala
f384e04678df10a5b46a439f475c63371bf8e32b
core/src/main/scala/kafka/network/RequestChannel.scala
bc73540acb1ceb303cb30e58dfa903822f7a8a6c
core/src/main/scala/kafka/network/SocketServer.scala
578283b34d218ff5b8a30e2c5d0e3383a28caea4
core/src/main/scala/kafka/producer/ProducerPool.scala
43df70bb461dd3e385e6b20396adef3c4016a3fc
core/src/main/scala/kafka/server/AbstractFetcherManager.scala
20c00cb8cc2351950edbc8cb1752905a0c26e79f
core/src/main/scala/kafka/server/AbstractFetcherThread.scala
5d5cf5897cc37b3595f14bfe9d7cde43456bcc4b
core/src/main/scala/kafka/server/KafkaApis.scala
f372af77f58aacee7981caa361e13eefecee2278
core/src/main/scala/kafka/server/KafkaConfig.scala
62173020ea47114dc7f5ae7c813c5b243c63a485
core/src/main/scala/kafka/server/KafkaHealthcheck.scala
7907987e43404487382de7f4cc294f0d01ac15a7
core/src/main/scala/kafka/server/KafkaServer.scala
10ea77ad9e8e44d7400a18f2d3fa301ec1cd0800
core/src/main/scala/kafka/server/MetadataCache.scala
6aef6e4508ecadbbcc1e12bed2054547b7aa333e
core/src/main/scala/kafka/server/ReplicaFetcherManager.scala
351dbbad3bdb709937943b336a5b0a9e0162a5e2
core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
96faa7b4ed7c9ba8a3f6f9f114bd94e19b3a7ac0
core/src/main/scala/kafka/server/ReplicaManager.scala
6e436227b1eb1d6e3d8354c546eb8329a9fc2034
core/src/main/scala/kafka/tools/ConsumerOffsetChecker.scala
d1e7c434e77859d746b8dc68dd5d5a3740425e79
core/src/main/scala/kafka/tools/ReplicaVerificationTool.scala
ba6ddd7a909df79a0f7d45e8b4a2af94ea0fceb6
core/src/main/scala/kafka/tools/SimpleConsumerShell.scala
b4f903b6c7c3bb725cac7c05eb1f885906413c4d
core/src/main/scala/kafka/tools/UpdateOffsetsInZK.scala
111c9a8b94ce45d95551482e9fd3f8c1cccbf548
core/src/main/scala/kafka/utils/Utils.scala
894a6a6ee98993325afb2fd9e1808cd7e5600101
core/src/main/scala/kafka/utils/ZkUtils.scala
7ae999ec619443d35a9cb8fbcd531fca0c51c8c0
core/src/test/scala/integration/kafka/api/ProducerSendTest.scala
aba256d67f393885150e927a58cc330e2b9ffd2a
core/src/test/scala/other/kafka/TestOffsetManager.scala
a106379d96ab3cbdf54a9f162db44a6df177e733
core/src/test/scala/unit/kafka/KafkaConfigTest.scala
4d36b8b1173f60d43463c13c9d8c1275a84c8c28
core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
99ac9230f63105a2942bec8fe2febde8a7e48b2e
core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala
030faacf278e7040ca7f9f2c1fac518008f7ae42
core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala PRE-CREATION
core/src/test/scala/unit/kafka/integration/FetcherTest.scala
ecb5a3389458bbf80114c52b453288e8cc1ed1ac
core/src/test/scala/unit/kafka/integration/KafkaServerTestHarness.scala
28e3122b71ca26c2fdf81649b0586ebc94e105fe
core/src/test/scala/unit/kafka/integration/TopicMetadataTest.scala
56b1b8c004b1719c45b1e7bc9580e3638e3438ac
core/src/test/scala/unit/kafka/log/LogTest.scala
ac4c5b91727fd58e30de639914be1154a5a89793
core/src/test/scala/unit/kafka/network/SocketServerTest.scala
79a806c7717f309eccc6241501c644f6f579bd24
core/src/test/scala/unit/kafka/producer/AsyncProducerTest.scala
d2ab683a63a5848bcb255fd82b8c53541b9d6c95
core/src/test/scala/unit/kafka/producer/SyncProducerTest.scala
7d6f655eea400a09c1083f71a1b3dbc126072346
core/src/test/scala/unit/kafka/server/AdvertiseBrokerTest.scala
b0112402e7813cf4f5247e90af87482c340bd000
core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala
150c311f29b81aad295016f44deaaf08dc4b84bf
core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
852fa3b1decafb84c0f7281dbdcbe8f80597118e
core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala
3d4258f8b31c1f2c7e0351fb6df9a96234e11d1d
core/src/test/scala/unit/kafka/utils/TestUtils.scala
f4518255a2bcf3ae3ccb19b9e2ff0b70c613966a
system_test/README.txt 0e469e373c9d91e6394a513ec581ef1cc92fa44c
system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
250ffe08ae4c2d35f7c79c883f47bbc27d5361b5
system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
3f9e7d05db17e170aea4fee5a13ab5534dd5db2e
system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
b10c6266a786acf0c4b1accb63f9727486d09fd9
system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
22c08023f3d9e7678fdb990518bdb7931b64b6ac
system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
1317d8460f82c3ff09d5a13a1277d695ba71d6e7
system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
d31346506a19dd066519303a19a191f70599918d
system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
bd00f130d7fc69dc43cf088e298abc43e51bf765
system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
ac5c13b09a84f975e345b635cf44a76935251244
system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
6dadd7a288664ebdc7d023c54d9cdb5a54d0c2e7
system_test/replication_testsuite/testcase_0101/testcase_0101_properties.json
614cb1cf01d3c76d8a97c2b52fb52bd83ec80c4b
system_test/replication_testsuite/testcase_0102/testcase_0102_properties.json
fbf01772545f016c28448235a5859429a3a83780
system_test/replication_testsuite/testcase_0103/testcase_0103_properties.json
317a6e3d3384009668e822e6c7e38b3fa34fcd6e
system_test/replication_testsuite/testcase_0104/testcase_0104_properties.json
d1a790b34fa5b42fe9fce2dabf6833048f9905ea
system_test/replication_testsuite/testcase_0105/testcase_0105_properties.json
8f4f8bfac71463bbe52906ee7a127d8b0b5f48a3
system_test/replication_testsuite/testcase_0106/testcase_0106_properties.json
a307f855c944946724cf3a91a9c07cc7b57b71f6
system_test/replication_testsuite/testcase_0107/testcase_0107_properties.json
827319eb6c6dbba0c8000b6e5e5a657a112deb21
system_test/replication_testsuite/testcase_0108/testcase_0108_properties.json
ae015cd0eb82b3d3f04e14c808b66dad702f7bf0
system_test/replication_testsuite/testcase_0109/testcase_0109_properties.json
1951a1220956f931032e8fcd214784d76472054b
system_test/replication_testsuite/testcase_1/testcase_1_properties.json
0c6d7a316cc6b51ac0755ca03558507db0706c31
system_test/run_all.sh PRE-CREATION
system_test/run_all_replica.sh PRE-CREATION
system_test/run_sanity.sh 9e8042a23b9359a5ad57b89540052ae7fadb6a55
system_test/testcase_to_run.json c6cf17ea690732bccbf4d60da6593f507c6da979
system_test/testcase_to_run_all_replica.json PRE-CREATION
system_test/utils/kafka_system_test_utils.py
41d511cbc310fa87e0f2cd2f772e479e8e3ae4e2
Diff: https://reviews.apache.org/r/28769/diff/
Testing
-------
Thanks,
Gwen Shapira
