Kafka
  1. Kafka
  2. KAFKA-896

merge 0.8 (988d4d8e65a14390abd748318a64e281e4a37c19) to trunk

    Details

    • Type: Task Task
    • Status: Resolved
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.8.1
    • Component/s: None
    • Labels:
      None

      Description

      Files that have conflicts:

      1. Unmerged paths:
      2. (use "git add/rm <file>..." as appropriate to mark resolution)
        #
      3. both modified: core/src/main/scala/kafka/admin/PreferredReplicaLeaderElectionCommand.scala
      4. both modified: core/src/main/scala/kafka/cluster/Partition.scala
      5. both modified: core/src/main/scala/kafka/log/FileMessageSet.scala
      6. both modified: core/src/main/scala/kafka/log/Log.scala
      7. both modified: core/src/main/scala/kafka/log/LogManager.scala
      8. both modified: core/src/main/scala/kafka/message/ByteBufferMessageSet.scala
      9. deleted by us: core/src/main/scala/kafka/server/HighwaterMarkCheckpoint.scala
      10. both modified: core/src/main/scala/kafka/server/KafkaApis.scala
      11. both modified: core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
      12. both modified: core/src/main/scala/kafka/server/ReplicaManager.scala
      13. both modified: core/src/main/scala/kafka/tools/DumpLogSegments.scala
      14. both modified: core/src/test/scala/unit/kafka/admin/AdminTest.scala
      15. both modified: core/src/test/scala/unit/kafka/utils/TestUtils.scala
        #

      Files have to be changed manually due to merge.

      1. Changed but not updated:
      2. (use "git add <file>..." to update what will be committed)
      3. (use "git checkout – <file>..." to discard changes in working directory)
        #
      4. modified: core/src/main/scala/kafka/log/LogSegment.scala
      5. modified: core/src/test/scala/unit/kafka/producer/ProducerTest.scala
        #
      1. kafka-896_v2.patch
        278 kB
        Jun Rao
      2. kafka-896.patch
        273 kB
        Jun Rao

        Activity

        Jun Rao made changes -
        Status Patch Available [ 10002 ] Resolved [ 5 ]
        Fix Version/s 0.8.1 [ 12322960 ]
        Resolution Fixed [ 1 ]
        Hide
        Jun Rao added a comment -

        Thanks for the review. Committed to trunk after addressing the comments below.

        1. The command is already there. We can file new jiras to make it an api.
        2. This is added since it's useful to know when a high watermark doesn't exist.
        3. This is because the usage of broker list is different btw 0.7 and 0.8. In 0.7, it's used to send the produce requests. In 0.8 it's only used to send metadata requests.

        Show
        Jun Rao added a comment - Thanks for the review. Committed to trunk after addressing the comments below. 1. The command is already there. We can file new jiras to make it an api. 2. This is added since it's useful to know when a high watermark doesn't exist. 3. This is because the usage of broker list is different btw 0.7 and 0.8. In 0.7, it's used to send the produce requests. In 0.8 it's only used to send metadata requests.
        Hide
        Jay Kreps added a comment -

        1. PreferredReplicaLeaderElectionCommand – this needs to be moved into AdminUtils. Let's please stop adding random commands like this...
        2. Partition - OffsetMap--shouldn't this be deleted?
        3. Why are we changing the property broker.list to metadata.broker.list? That is a pretty unintuitive name.

        Show
        Jay Kreps added a comment - 1. PreferredReplicaLeaderElectionCommand – this needs to be moved into AdminUtils. Let's please stop adding random commands like this... 2. Partition - OffsetMap--shouldn't this be deleted? 3. Why are we changing the property broker.list to metadata.broker.list? That is a pretty unintuitive name.
        Jun Rao made changes -
        Status Open [ 1 ] Patch Available [ 10002 ]
        Assignee Jun Rao [ junrao ]
        Jun Rao made changes -
        Attachment kafka-896_v2.patch [ 12581768 ]
        Hide
        Jun Rao added a comment -

        Attach patch v2. Merged the changes in ListTopicCommand.scala to TopicCommand.scala and delete ListTopicCommand.scala

        Show
        Jun Rao added a comment - Attach patch v2. Merged the changes in ListTopicCommand.scala to TopicCommand.scala and delete ListTopicCommand.scala
        Jun Rao made changes -
        Field Original Value New Value
        Attachment kafka-896.patch [ 12581653 ]
        Hide
        Jun Rao added a comment -

        Attach the merge. Most of the conflicts are easy to resolve. Non-trivial ones are in KafkaApis and Partition.

        Verified that all unit tests pass after the merge.

        Show
        Jun Rao added a comment - Attach the merge. Most of the conflicts are easy to resolve. Non-trivial ones are in KafkaApis and Partition. Verified that all unit tests pass after the merge.
        Jun Rao created issue -

          People

          • Assignee:
            Jun Rao
            Reporter:
            Jun Rao
          • Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development