Skip to content

KAFKA-12436 KIP-720 Deprecate MirrorMaker v1 #10805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mimaison merged 12 commits into from
Jul 4, 2021
Merged

KAFKA-12436 KIP-720 Deprecate MirrorMaker v1 #10805

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4059adf
Deprecate MM1
Jun 2, 2021
2231d38
reword deprecation doc
Jun 2, 2021
7c5cedd
Merge branch 'apache:trunk' into KAFKA-12436
ryannedolan Jun 3, 2021
1ed446c
use Scala deprecation tag and drop nowarn
Jun 4, 2021
a9894a6
Merge branch 'KAFKA-12436' of github.com:ryannedolan/kafka into KAFKA…
Jun 4, 2021
dd023fe
ignore deprecation warning in MM integration test
Jun 4, 2021
b1d005a
Merge branch 'apache:trunk' into KAFKA-12436
ryannedolan Jun 16, 2021
6f270ea
Merge branch 'apache:trunk' into KAFKA-12436
ryannedolan Jun 21, 2021
d3b3d10
Merge branch 'apache:trunk' into KAFKA-12436
ryannedolan Jul 2, 2021
ed4481a
deprecate old MM integration tests
Jul 2, 2021
f8bedee
add deprecation note
Jul 3, 2021
112009b
fix html
Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/src/main/scala/kafka/tools/MirrorMaker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import org.apache.kafka.common.serialization.{ByteArrayDeserializer, ByteArraySe
import org.apache.kafka.common.utils.{Time, Utils}
import org.apache.kafka.common.{KafkaException, TopicPartition}

import scala.annotation.nowarn
import scala.jdk.CollectionConverters._
import scala.collection.mutable.HashMap
import scala.util.control.ControlThrowable
Expand All @@ -58,7 +57,10 @@ import scala.util.{Failure, Success, Try}
* enable.auto.commit=false
* 3. Mirror Maker Setting:
* abort.on.send.failure=true
*
* @deprecated Since 3.0, use the Connect-based MirrorMaker instead (aka MM2).
*/
@deprecated(message = "Use the Connect-based MirrorMaker instead (aka MM2).", since = "3.0")
object MirrorMaker extends Logging with KafkaMetricsGroup {

private[tools] var producer: MirrorMakerProducer = null
Expand All @@ -80,6 +82,7 @@ object MirrorMaker extends Logging with KafkaMetricsGroup {

def main(args: Array[String]): Unit = {

warn("This tool is deprecated and may be removed in a future major release.")
info("Starting mirror maker")
try {
val opts = new MirrorMakerOptions(args)
Expand Down Expand Up @@ -191,7 +194,6 @@ object MirrorMaker extends Logging with KafkaMetricsGroup {

setName(threadName)

@nowarn("cat=deprecation")
private def toBaseConsumerRecord(record: ConsumerRecord[Array[Byte], Array[Byte]]): BaseConsumerRecord =
BaseConsumerRecord(record.topic,
record.partition,
Expand Down Expand Up @@ -414,12 +416,10 @@ object MirrorMaker extends Logging with KafkaMetricsGroup {
* If message.handler.args is specified. A constructor that takes in a String as argument must exist.
*/
trait MirrorMakerMessageHandler {
@nowarn("cat=deprecation")
def handle(record: BaseConsumerRecord): util.List[ProducerRecord[Array[Byte], Array[Byte]]]
}

private[tools] object defaultMirrorMakerMessageHandler extends MirrorMakerMessageHandler {
@nowarn("cat=deprecation")
override def handle(record: BaseConsumerRecord): util.List[ProducerRecord[Array[Byte], Array[Byte]]] = {
val timestamp: java.lang.Long = if (record.timestamp == RecordBatch.NO_TIMESTAMP) null else record.timestamp
Collections.singletonList(new ProducerRecord(record.topic, null, timestamp, record.key, record.value, record.headers))
Expand Down
3 changes: 3 additions & 0 deletions core/src/test/scala/integration/kafka/tools/MirrorMakerIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.BeforeEach

import scala.annotation.nowarn

@nowarn("cat=deprecation")

@ijuma ijuma Jul 1, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we deprecate the test too instead of the warning suppression?

@ryannedolan ryannedolan Jul 2, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call, done!

class MirrorMakerIntegrationTest extends KafkaServerTestHarness {

override def generateConfigs: Seq[KafkaConfig] =
Expand Down