[
https://issues.apache.org/jira/browse/KAFKA-1051?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jun Rao updated KAFKA-1051:
---------------------------
Resolution: Fixed
Status: Resolved (was: Patch Available)
Since all merge conflicts are easy to resolve, committed the patch to trunk.
All unit tests pass in trunk. Filed KAFKA-1052 to integrate the addPartitions
command into topicCommand. The following is a summary of the changes.
# On branch trunk
# Changes to be committed:
#
# modified: README.md
# modified: bin/kafka-check-reassignment-status.sh
# deleted: bin/kafka-console-consumer-log4j.properties
# modified: bin/kafka-console-consumer.sh
# modified: bin/kafka-console-producer.sh
# modified: bin/kafka-consumer-perf-test.sh
# modified: bin/kafka-preferred-replica-election.sh
# modified: bin/kafka-producer-perf-test.sh
# modified: bin/kafka-reassign-partitions.sh
# modified: bin/kafka-replay-log-producer.sh
# modified: bin/kafka-run-class.sh
# modified: bin/kafka-server-start.sh
# modified: bin/kafka-server-stop.sh
# modified: bin/kafka-simple-consumer-perf-test.sh
# modified: bin/zookeeper-server-start.sh
# modified: config/log4j.properties
# modified: config/producer.properties
# renamed: bin/kafka-add-partitions.sh -> config/tools-log4j.properties
# modified: contrib/hadoop-producer/README.md
# modified:
contrib/hadoop-producer/src/main/java/kafka/bridge/hadoop/KafkaOutputFormat.java
# modified:
contrib/hadoop-producer/src/main/java/kafka/bridge/hadoop/KafkaRecordWriter.java
# new file: core/src/main/scala/kafka/admin/AddPartitionsCommand.scala
# modified: core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
# modified: core/src/main/scala/kafka/api/LeaderAndIsrRequest.scala
# modified: core/src/main/scala/kafka/cluster/Broker.scala
# modified: core/src/main/scala/kafka/cluster/Partition.scala
# modified: core/src/main/scala/kafka/consumer/ConsumerFetcherManager.scala
# modified: core/src/main/scala/kafka/consumer/PartitionTopicInfo.scala
# modified: core/src/main/scala/kafka/consumer/SimpleConsumer.scala
# modified:
core/src/main/scala/kafka/controller/ControllerChannelManager.scala
# modified: core/src/main/scala/kafka/controller/KafkaController.scala
# modified: core/src/main/scala/kafka/controller/PartitionStateMachine.scala
# modified: core/src/main/scala/kafka/controller/ReplicaStateMachine.scala
# modified: core/src/main/scala/kafka/network/RequestChannel.scala
# modified: core/src/main/scala/kafka/network/SocketServer.scala
# new file: core/src/main/scala/kafka/producer/ByteArrayPartitioner.scala
# modified: core/src/main/scala/kafka/producer/ConsoleProducer.scala
# modified: core/src/main/scala/kafka/producer/Producer.scala
# modified: core/src/main/scala/kafka/producer/async/DefaultEventHandler.scala
# modified: core/src/main/scala/kafka/server/AbstractFetcherThread.scala
# modified: core/src/main/scala/kafka/server/KafkaApis.scala
# modified: core/src/main/scala/kafka/server/KafkaConfig.scala
# modified: core/src/main/scala/kafka/server/KafkaRequestHandler.scala
# modified: core/src/main/scala/kafka/server/ReplicaManager.scala
# modified: core/src/main/scala/kafka/server/ZookeeperLeaderElector.scala
# modified: core/src/main/scala/kafka/tools/ImportZkOffsets.scala
# modified: core/src/main/scala/kafka/tools/MirrorMaker.scala
# new file: core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
# modified: core/src/test/scala/unit/kafka/producer/ProducerTest.scala
# modified: core/src/test/scala/unit/kafka/producer/SyncProducerTest.scala
# modified: core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala
# modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala
# modified: project/Build.scala
# modified: system_test/migration_tool_testsuite/0.7/lib/kafka-perf-0.7.0.jar
# modified:
system_test/migration_tool_testsuite/config/migration_producer.properties
# modified: system_test/migration_tool_testsuite/migration_tool_test.py
# modified:
system_test/migration_tool_testsuite/testcase_9001/testcase_9001_properties.json
# modified:
system_test/migration_tool_testsuite/testcase_9003/testcase_9003_properties.json
# modified:
system_test/migration_tool_testsuite/testcase_9004/testcase_9004_properties.json
# modified:
system_test/migration_tool_testsuite/testcase_9005/testcase_9005_properties.json
# modified:
system_test/migration_tool_testsuite/testcase_9006/testcase_9006_properties.json
# modified: system_test/mirror_maker_testsuite/mirror_maker_test.py
# modified: system_test/replication_testsuite/replica_basic_test.py
# modified:
system_test/replication_testsuite/testcase_0001/testcase_0001_properties.json
# modified:
system_test/replication_testsuite/testcase_0002/testcase_0002_properties.json
# modified:
system_test/replication_testsuite/testcase_0003/testcase_0003_properties.json
# modified:
system_test/replication_testsuite/testcase_0004/testcase_0004_properties.json
# modified:
system_test/replication_testsuite/testcase_0005/testcase_0005_properties.json
# modified:
system_test/replication_testsuite/testcase_0006/testcase_0006_properties.json
# modified:
system_test/replication_testsuite/testcase_0007/testcase_0007_properties.json
# modified:
system_test/replication_testsuite/testcase_0008/testcase_0008_properties.json
# modified:
system_test/replication_testsuite/testcase_0009/testcase_0009_properties.json
# modified:
system_test/replication_testsuite/testcase_0010/testcase_0010_properties.json
# modified:
system_test/replication_testsuite/testcase_0011/testcase_0011_properties.json
# modified:
system_test/replication_testsuite/testcase_0021/testcase_0021_properties.json
# modified:
system_test/replication_testsuite/testcase_0022/testcase_0022_properties.json
# modified:
system_test/replication_testsuite/testcase_0023/testcase_0023_properties.json
# modified:
system_test/replication_testsuite/testcase_0111/testcase_0111_properties.json
# modified:
system_test/replication_testsuite/testcase_0112/testcase_0112_properties.json
# modified:
system_test/replication_testsuite/testcase_0113/testcase_0113_properties.json
# modified:
system_test/replication_testsuite/testcase_0114/testcase_0114_properties.json
# modified:
system_test/replication_testsuite/testcase_0115/testcase_0115_properties.json
# modified:
system_test/replication_testsuite/testcase_0116/testcase_0116_properties.json
# modified:
system_test/replication_testsuite/testcase_0117/testcase_0117_properties.json
# modified:
system_test/replication_testsuite/testcase_0118/testcase_0118_properties.json
# modified:
system_test/replication_testsuite/testcase_0121/testcase_0121_properties.json
# modified:
system_test/replication_testsuite/testcase_0122/testcase_0122_properties.json
# modified:
system_test/replication_testsuite/testcase_0123/testcase_0123_properties.json
# modified:
system_test/replication_testsuite/testcase_0124/testcase_0124_properties.json
# modified:
system_test/replication_testsuite/testcase_0125/testcase_0125_properties.json
# modified:
system_test/replication_testsuite/testcase_0126/testcase_0126_properties.json
# modified:
system_test/replication_testsuite/testcase_0127/testcase_0127_properties.json
# modified:
system_test/replication_testsuite/testcase_0131/testcase_0131_properties.json
# modified:
system_test/replication_testsuite/testcase_0132/testcase_0132_properties.json
# modified:
system_test/replication_testsuite/testcase_0133/testcase_0133_properties.json
# modified:
system_test/replication_testsuite/testcase_0201/testcase_0201_properties.json
# modified:
system_test/replication_testsuite/testcase_0202/testcase_0202_properties.json
# modified:
system_test/replication_testsuite/testcase_0203/testcase_0203_properties.json
# modified:
system_test/replication_testsuite/testcase_0204/testcase_0204_properties.json
# modified:
system_test/replication_testsuite/testcase_0205/testcase_0205_properties.json
# modified:
system_test/replication_testsuite/testcase_0206/testcase_0206_properties.json
# modified:
system_test/replication_testsuite/testcase_0207/testcase_0207_properties.json
# modified:
system_test/replication_testsuite/testcase_0208/testcase_0208_properties.json
# modified:
system_test/replication_testsuite/testcase_0251/testcase_0251_properties.json
# modified:
system_test/replication_testsuite/testcase_0252/testcase_0252_properties.json
# modified:
system_test/replication_testsuite/testcase_0253/testcase_0253_properties.json
# modified:
system_test/replication_testsuite/testcase_0254/testcase_0254_properties.json
# modified:
system_test/replication_testsuite/testcase_0255/testcase_0255_properties.json
# modified:
system_test/replication_testsuite/testcase_0256/testcase_0256_properties.json
# modified:
system_test/replication_testsuite/testcase_0257/testcase_0257_properties.json
# modified:
system_test/replication_testsuite/testcase_0258/testcase_0258_properties.json
# modified:
system_test/replication_testsuite/testcase_0301/testcase_0301_properties.json
# modified:
system_test/replication_testsuite/testcase_0302/testcase_0302_properties.json
# modified:
system_test/replication_testsuite/testcase_0303/testcase_0303_properties.json
# modified:
system_test/replication_testsuite/testcase_0304/testcase_0304_properties.json
# modified:
system_test/replication_testsuite/testcase_0305/testcase_0305_properties.json
# modified:
system_test/replication_testsuite/testcase_0306/testcase_0306_properties.json
# modified:
system_test/replication_testsuite/testcase_0307/testcase_0307_properties.json
# modified:
system_test/replication_testsuite/testcase_0308/testcase_0308_properties.json
# modified:
system_test/replication_testsuite/testcase_4001/testcase_4001_properties.json
# modified:
system_test/replication_testsuite/testcase_4002/testcase_4002_properties.json
# modified:
system_test/replication_testsuite/testcase_4003/testcase_4003_properties.json
# modified:
system_test/replication_testsuite/testcase_4004/testcase_4004_properties.json
# modified:
system_test/replication_testsuite/testcase_4005/testcase_4005_properties.json
# modified:
system_test/replication_testsuite/testcase_4006/testcase_4006_properties.json
# modified:
system_test/replication_testsuite/testcase_4007/testcase_4007_properties.json
# modified:
system_test/replication_testsuite/testcase_4008/testcase_4008_properties.json
# modified:
system_test/replication_testsuite/testcase_4011/testcase_4011_properties.json
# modified:
system_test/replication_testsuite/testcase_4012/testcase_4012_properties.json
# modified:
system_test/replication_testsuite/testcase_4013/testcase_4013_properties.json
# modified:
system_test/replication_testsuite/testcase_4014/testcase_4014_properties.json
# modified:
system_test/replication_testsuite/testcase_4015/testcase_4015_properties.json
# modified:
system_test/replication_testsuite/testcase_4016/testcase_4016_properties.json
# modified:
system_test/replication_testsuite/testcase_4017/testcase_4017_properties.json
# modified:
system_test/replication_testsuite/testcase_4018/testcase_4018_properties.json
# modified: system_test/utils/kafka_system_test_utils.py
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: bin/kafka-create-topic.sh
# both modified: bin/kafka-topics.sh
# both modified: config/server.properties
# both modified: core/src/main/scala/kafka/admin/AdminUtils.scala
# both modified:
core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala
# both modified: core/src/main/scala/kafka/server/KafkaHealthcheck.scala
# both modified: core/src/main/scala/kafka/utils/ZkUtils.scala
# both modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: core/src/main/scala/kafka/admin/AddPartitionsCommand.scala
# modified: core/src/main/scala/kafka/admin/TopicCommand.scala
# modified: core/src/main/scala/kafka/producer/ByteArrayPartitioner.scala
# modified: core/src/main/scala/kafka/producer/DefaultPartitioner.scala
# modified: core/src/main/scala/kafka/server/KafkaServer.scala
# modified: core/src/test/scala/unit/kafka/admin/AddPartitionsTest.scala
# modified: core/src/test/scala/unit/kafka/consumer/ConsumerIteratorTest.scala
# modified: core/src/test/scala/unit/kafka/integration/FetcherTest.scala
# modified: core/src/test/scala/unit/kafka/integration/RollingBounceTest.scala
# modified: core/src/test/scala/unit/kafka/producer/ProducerTest.scala
# modified: core/src/test/scala/unit/kafka/producer/SyncProducerTest.scala
# modified: core/src/test/scala/unit/kafka/server/LeaderElectionTest.scala
# modified: core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
> merge from 0.8 da4512174b6f7c395ffe053a86d2c6bb19d2538a to trunk
> ----------------------------------------------------------------
>
> Key: KAFKA-1051
> URL: https://issues.apache.org/jira/browse/KAFKA-1051
> Project: Kafka
> Issue Type: Task
> Affects Versions: 0.8.1
> Reporter: Jun Rao
> Assignee: Jun Rao
> Fix For: 0.8.1
>
> Attachments: kafka-1051.patch
>
>
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
