Merge branch 'master' into DOCSP-27072

Author: DBirtolo-mdb

config/redirects

@@ -1,7 +1,7 @@
 define: prefix docs/kafka-connector
 define: base https://www.mongodb.com/${prefix}
 
-define: versions v1.0 v1.1 v1.2 v1.3 v1.4 v1.5 v1.6 v1.7 v1.8 master
+define: versions v1.0 v1.1 v1.2 v1.3 v1.4 v1.5 v1.6 v1.7 v1.8 v1.9 master
 
 symlink: current -> master
 

snooty.toml

@@ -11,9 +11,9 @@ kafka-connect = "Kafka Connect"
 kafka-connect-long = "Confluent Kafka Connect"
 avro-long = "Apache Avro"
 avro = "Avro"
-connector_version="1.8"
-connector_patch_version="1"
-connector_driver_version="4.5"
+connector_version="1.9"
+connector_patch_version="0"
+connector_driver_version="4.7"
 connector_version_github_tag="master"
 connector_kafka_version_major="2"
 connector_kafka_version_minor="6"

source/includes/m1-incompatibility.rst

@@ -18,8 +18,6 @@ Overview
 This guide shows you how to configure the {+connector+} to send data between MongoDB
 and {+kafka+}.
 
-.. include:: /includes/m1-incompatibility.rst
-
 After completing this guide, you should understand how to use the {+kafka-connect+}
 REST API to configure {+connector+}s to read data from MongoDB and write it to a
 Kafka topic, and to read data from a Kafka topic and write it to MongoDB.

source/quick-start.txt

@@ -77,25 +77,8 @@ Settings
          When set to ``true``, the default value, the
          connector writes a batch of records as an ordered bulk write
          operation.
-       | To learn more about ordered and unordered
-         bulk write operations, see
-         `Bulk Write Operations <{+connector_driver_url_base+}fundamentals/crud/write-operations/bulk/#order-of-execution>`__
-         in the MongoDB Java driver documentation.
-
-       .. tip:: Performance Benefits
-
-          If you can write your data to MongoDB in any order, use unordered
-          bulk write operations. Unordered bulk writes provide the following
-          benefits: 
-          
-          - MongoDB can execute unordered bulk writes in parallel
-          - If you configured your connector to tolerate errors, unordered bulk writes 
-            help you :ref:`lose less data <kafka-sink-bulk-ordered-data-loss>`.
-
-          To learn more about the performance benefits of unordered
-          bulk write operations, see :manual:`Unordered Operations </reference/method/Bulk/#unordered-operations>`
-          in the MongoDB Manual. 
-
+       | To learn more about bulk write operations, see the :ref:`Write
+         Model Strategies page <sink-connector-bulk-write-ops>`.
        |
        | **Default**: ``true``
        | **Accepted Values**: ``true`` or ``false``

source/sink-connector/configuration-properties/connector-message.txt

@@ -88,19 +88,9 @@ option:
 .. warning:: Ordered Bulk Writes Can Result in Skipped Messages
 
    If you set your connector to tolerate errors and use ordered bulk writes, you
-   may lose data. When an ordered bulk write fails, the connector skips the
-   remaining writes in that batch and resumes processing the next batch.
-   
-   If you set your connector to tolerate errors and use unordered bulk writes,
-   you lose less data. Your connector attempts to perform every write in the
-   batch even if some writes fail. 
-   
-   When using unordered bulk writes, ensure you can perform the write operations
-   within each batch in any order.
-
-   To configure your connector to use unordered bulk writes, set the
-   ``bulk.write.ordered`` property to ``false``. To learn more about this
-   property, see the :ref:`<sink-configuration-message-processing>` page.
+   may lose data. If you set your connector to tolerate errors and use unordered bulk writes,
+   you lose less data. To learn more about bulk write operations, see
+   the :ref:`Write Model Strategies page <sink-connector-bulk-write-ops>`.
 
 .. _kafka-sink-errors-dlq:
 

source/sink-connector/fundamentals/error-handling-strategies.txt

@@ -35,11 +35,46 @@ To learn how to modify the sink records your connector receives before your
 connector writes them to MongoDB, read the guide on
 :ref:`Sink Connector Post Processors <sink-fundamentals-post-processors>`.
 
-To learn more about bulk writes, see the MongoDB Java driver guide on
-`Bulk Writes <{+connector_driver_url_base+}fundamentals/crud/write-operations/bulk/>`__.
-
 To see a write model strategy implementation, see the source code of the
-:github:`InsertOneDefaultStrategy class <mongodb/mongo-kafka/blob/master/src/main/java/com/mongodb/kafka/connect/sink/writemodel/strategy/InsertOneDefaultStrategy.java>`.
+:github:`InsertOneDefaultStrategy class
+<mongodb/mongo-kafka/blob/master/src/main/java/com/mongodb/kafka/connect/sink/writemodel/strategy/InsertOneDefaultStrategy.java>`.
+
+.. _sink-connector-bulk-write-ops:
+
+Bulk Write Operations
+---------------------
+
+The sink connector writes data to MongoDB using bulk write operations.
+Bulk writes group multiple write operations, such as inserts,
+updates, or deletes, together. 
+
+By default, the sink connector performs ordered bulk writes, which
+guarantee the order of data changes. In an ordered bulk write, if any
+write operation results in an error, the connector skips the remaining
+writes in that batch.
+
+If you don't need to guarantee the order of data changes, you can
+set the ``bulk.write.ordered`` setting to ``false`` so that the
+connector performs unordered bulk writes. The sink connector performs
+unordered bulk writes in parallel, which can improve performance.
+
+In addition, when you enable unordered bulk writes and set the
+``errors.tolerance`` setting to ``all``, even if any write
+operation in your bulk write fails, the connector continues to
+perform the remaining write operations in the batch that do not return
+errors.
+
+.. tip::
+
+   To learn more about the ``bulk.write.ordered`` setting, see the
+   :ref:`Connector Message Processing Properties
+   <sink-configuration-message-processing>`.
+   
+   To learn more about bulk write operations, see the following
+   documentation:
+
+   - :manual:`Server manual entry on ordered and unordered bulk operations </reference/method/Bulk/#ordered-and-unordered-bulk-operations>`.
+   - `Bulk write operations in Java <{+connector_driver_url_base+}fundamentals/crud/write-operations/bulk/#order-of-execution>`__
 
 How to Specify Write Model Strategies
 -------------------------------------

source/sink-connector/fundamentals/write-strategies.txt

@@ -46,6 +46,7 @@ What's New in 1.9
   that configures the connector to send tombstone events when documents
   are deleted. This setting only applies when ``publish.full.document.only``
   is ``true``.
+- Added MongoDB server exception information to dead letter queue messages.
 
 .. _kafka-connector-whats-new-1.8.1: