[
https://issues.apache.org/jira/browse/KAFKA-672?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jay Kreps updated KAFKA-672:
----------------------------
Attachment: KAFKA-672.patch
Here is the merge changes in case anyone wants to take a look. I will probably
proceed with the merge tomorrow if I don't hear back.
Conflicts:
core/src/main/scala/kafka/log/Log.scala
core/src/test/scala/unit/kafka/admin/AdminTest.scala
core/src/test/scala/unit/kafka/server/LogOffsetTest.scala
Full change list:
# On branch trunk-0.8-merge
# Changes to be committed:
#
# deleted: bin/kafka-producer-shell.sh
# new file: bin/windows/kafka-server-stop.bat
# new file: bin/windows/zookeeper-server-stop.bat
# modified:
contrib/hadoop-consumer/src/main/java/kafka/etl/KafkaETLContext.java
# modified: core/src/main/scala/kafka/admin/AdminUtils.scala
# modified: core/src/main/scala/kafka/api/FetchRequest.scala
# modified: core/src/main/scala/kafka/api/FetchResponse.scala
# modified: core/src/main/scala/kafka/api/LeaderAndIsrRequest.scala
# modified: core/src/main/scala/kafka/api/LeaderAndIsrResponse.scala
# modified: core/src/main/scala/kafka/api/OffsetRequest.scala
# modified: core/src/main/scala/kafka/api/OffsetResponse.scala
# modified: core/src/main/scala/kafka/api/ProducerRequest.scala
# modified: core/src/main/scala/kafka/api/ProducerResponse.scala
# modified: core/src/main/scala/kafka/api/StopReplicaRequest.scala
# modified: core/src/main/scala/kafka/api/StopReplicaResponse.scala
# modified: core/src/main/scala/kafka/api/TopicMetadata.scala
# modified: core/src/main/scala/kafka/api/TopicMetadataRequest.scala
# modified: core/src/main/scala/kafka/api/TopicMetadataResponse.scala
# modified: core/src/main/scala/kafka/client/ClientUtils.scala
# modified: core/src/main/scala/kafka/cluster/Broker.scala
# renamed:
core/src/main/scala/kafka/producer/async/AsyncProducerStats.scala ->
core/src/main/scala/kafka/common/InvalidClientIdException.scala
# new file: core/src/main/scala/kafka/common/TopicExistsException.scala
# modified: core/src/main/scala/kafka/consumer/ConsoleConsumer.scala
# modified:
core/src/main/scala/kafka/consumer/ConsumerFetcherManager.scala
# modified: core/src/main/scala/kafka/consumer/ConsumerIterator.scala
# modified: core/src/main/scala/kafka/consumer/ConsumerTopicStat.scala
# renamed: core/src/main/scala/kafka/consumer/ConsumerTopicStat.scala
-> core/src/main/scala/kafka/consumer/ConsumerTopicStats.scala
# modified: core/src/main/scala/kafka/consumer/KafkaStream.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/consumer/ZookeeperConsumerConnector.scala
# modified: core/src/main/scala/kafka/controller/KafkaController.scala
# modified:
core/src/main/scala/kafka/controller/PartitionLeaderSelector.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/javaapi/TopicMetadataRequest.scala
# modified:
core/src/main/scala/kafka/javaapi/consumer/SimpleConsumer.scala
# modified:
core/src/main/scala/kafka/javaapi/consumer/ZookeeperConsumerConnector.scala
# modified: core/src/main/scala/kafka/message/Message.scala
# modified:
core/src/main/scala/kafka/metrics/KafkaCSVMetricsReporter.scala
# modified: core/src/main/scala/kafka/producer/BrokerPartitionInfo.scala
# modified: core/src/main/scala/kafka/producer/ConsoleProducer.scala
# modified: core/src/main/scala/kafka/producer/DefaultPartitioner.scala
# modified: core/src/main/scala/kafka/producer/Producer.scala
# modified: core/src/main/scala/kafka/producer/ProducerConfig.scala
# modified: core/src/main/scala/kafka/producer/ProducerPool.scala
# modified: core/src/main/scala/kafka/producer/SyncProducer.scala
# modified: core/src/main/scala/kafka/producer/SyncProducerConfig.scala
# modified:
core/src/main/scala/kafka/producer/async/AsyncProducerStats.scala
# modified:
core/src/main/scala/kafka/producer/async/DefaultEventHandler.scala
# modified:
core/src/main/scala/kafka/producer/async/ProducerSendThread.scala
# modified: core/src/main/scala/kafka/serializer/Decoder.scala
# modified: core/src/main/scala/kafka/serializer/Encoder.scala
# modified: core/src/main/scala/kafka/server/AbstractFetcherThread.scala
# modified:
core/src/main/scala/kafka/server/HighwaterMarkCheckpoint.scala
# modified: core/src/main/scala/kafka/server/KafkaApis.scala
# modified: core/src/main/scala/kafka/server/KafkaRequestHandler.scala
# modified: core/src/main/scala/kafka/server/KafkaServer.scala
# modified: core/src/main/scala/kafka/server/KafkaZooKeeper.scala
# modified: core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
# modified: core/src/main/scala/kafka/tools/ConsumerOffsetChecker.scala
# modified: core/src/main/scala/kafka/tools/DumpLogSegments.scala
# modified: core/src/main/scala/kafka/tools/GetOffsetShell.scala
# modified: core/src/main/scala/kafka/tools/MirrorMaker.scala
# deleted: core/src/main/scala/kafka/tools/ProducerShell.scala
# modified: core/src/main/scala/kafka/tools/ReplayLogProducer.scala
# modified: core/src/main/scala/kafka/tools/SimpleConsumerShell.scala
# modified: core/src/main/scala/kafka/tools/UpdateOffsetsInZK.scala
# renamed: core/src/main/scala/kafka/utils/Topic.scala ->
core/src/main/scala/kafka/utils/ClientIdAndTopic.scala
# modified: core/src/main/scala/kafka/utils/Topic.scala
# modified: core/src/main/scala/kafka/utils/Utils.scala
# modified: core/src/main/scala/kafka/utils/ZkUtils.scala
# modified: core/src/test/scala/other/kafka/TestKafkaAppender.scala
# modified: core/src/test/scala/other/kafka/TestZKConsumerOffsets.scala
# modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
# modified:
core/src/test/scala/unit/kafka/api/RequestResponseSerializationTest.scala
# modified:
core/src/test/scala/unit/kafka/consumer/ConsumerIteratorTest.scala
# modified:
core/src/test/scala/unit/kafka/integration/AutoOffsetResetTest.scala
# modified: core/src/test/scala/unit/kafka/integration/FetcherTest.scala
# modified:
core/src/test/scala/unit/kafka/integration/LazyInitProducerTest.scala
# modified:
core/src/test/scala/unit/kafka/integration/PrimitiveApiTest.scala
# modified:
core/src/test/scala/unit/kafka/integration/ProducerConsumerTestHarness.scala
# modified:
core/src/test/scala/unit/kafka/javaapi/consumer/ZookeeperConsumerConnectorTest.scala
# modified:
core/src/test/scala/unit/kafka/log4j/KafkaLog4jAppenderTest.scala
# modified:
core/src/test/scala/unit/kafka/network/SocketServerTest.scala
# modified:
core/src/test/scala/unit/kafka/producer/AsyncProducerTest.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/LogOffsetTest.scala
# modified: core/src/test/scala/unit/kafka/server/LogRecoveryTest.scala
# modified:
core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
# new file: core/src/test/scala/unit/kafka/utils/ClientIdTest.scala
# modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala
# modified:
examples/src/main/java/kafka/examples/SimpleConsumerDemo.java
# modified: perf/src/main/scala/kafka/perf/ProducerPerformance.scala
# modified:
perf/src/main/scala/kafka/perf/SimpleConsumerPerformance.scala
# modified: system_test/migration_tool_testsuite/migration_tool_test.py
# 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_9051/cluster_config.json
# modified:
system_test/replication_testsuite/testcase_9051/testcase_9051_properties.json
# modified: system_test/testcase_to_run.json
# modified: system_test/utils/kafka_system_test_utils.py
#
> Merge 0.8 changes to trunk
> --------------------------
>
> Key: KAFKA-672
> URL: https://issues.apache.org/jira/browse/KAFKA-672
> Project: Kafka
> Issue Type: Bug
> Reporter: Jay Kreps
> Assignee: Jay Kreps
> Attachments: KAFKA-672.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
