removing/rewording interconnect docs as only UDPIFC is supported in 5… (#2387)

* removing/rewording interconnect docs as only UDPIFC is supported in 5.0.0 * update docs to return TCP as valid interconnect for 5.0.0

removing/rewording interconnect docs as only UDPIFC is supported in 5… (#2387)
* removing/rewording interconnect docs as only UDPIFC is supported in 5.0.0 * update docs to return TCP as valid interconnect for 5.0.0
f822ed38 · David Yozie · GitHub · 7daf9401 · f822ed38 · f822ed38
4 changed file
--- a/gpdb-doc/dita/admin_guide/intro/arch_overview.xml
+++ b/gpdb-doc/dita/admin_guide/intro/arch_overview.xml
@@ -95,15 +95,13 @@
      <p>The <i>interconnect</i> refers to the inter-process communication between segments and the
        network infrastructure on which this communication relies. The Greenplum interconnect uses a
        standard 10-Gigabit Ethernet switching fabric.</p>
-      <p>By default, the interconnect uses User Datagram Protocol (UDP) with flow control for
+      <p>By default, the interconnect uses User Datagram Protocol with flow control (UDPIFC) for
        interconnect traffic to send messages over the network. The Greenplum software performs
        packet verification beyond what is provided by UDP. This means the reliability is equivalent
        to Transmission Control Protocol (TCP), and the performance and scalability exceeds TCP. If
-        the interconnect used TCP, Greenplum Database would have a scalability limit of 1000 segment
-        instances. With UDP as the current default protocol for the interconnect, this limit is not
-        applicable. For information about the types of interconnect supported by Greeplum Database,
-        see server configuration parameter <codeph>gp_interconnect_type</codeph> in the
-          <cite>Greenplum Database Reference Guide</cite>.</p>
+        the interconnect is changed to TCP, Greenplum Database has a scalability limit of 1000
+        segment instances. With UDPIFC as the default protocol for the interconnect, this limit is
+        not applicable.</p>
    </body>
  </topic>
 </topic>
--- a/gpdb-doc/dita/admin_guide/topics/g-interconnect-configuration-parameters.xml
+++ b/gpdb-doc/dita/admin_guide/topics/g-interconnect-configuration-parameters.xml
@@ -33,10 +33,7 @@
         </strow>
      </simpletable>
      <p>
-         <note>The Greenplum Database interconnect types TCP and UDP are deprecated. In the next
-            major release, only the UDPIFC interconnect type will be supported by Greenplum
-            Database. The server configuration parameter <codeph>gp_interconnect_type</codeph>
-            controls the interconnect type.</note>
+         <note>Greenplum Database supports only the UDPIFC and TCP interconnect types.</note>
      </p>
   </body>
 </topic>
--- a/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
+++ b/gpdb-doc/dita/ref_guide/config_params/guc-list.xml
@@ -4050,8 +4050,8 @@
  <topic id="gp_interconnect_fc_method">
    <title>gp_interconnect_fc_method</title>
    <body>
-      <p>Specifies the flow control method used for UDP interconnect when the value of <xref
-          href="#gp_interconnect_type" format="dita"/> is <codeph>UDPIFC</codeph>.</p>
+      <p>Specifies the flow control method used for the default Greenplum Database UDPIFC
+        interconnect.</p>
      <p>For capacity based flow control, senders do not send packets when receivers do not have the
        capacity.</p>
      <p>Loss based flow control is based on capacity based flow control, and also tunes the sending
@@ -4083,11 +4083,10 @@
    <title>gp_interconnect_hash_multiplier</title>
    <body>
      <p>Sets the size of the hash table used by the Greenplum Database to track interconnect
-        connections when <xref href="#gp_interconnect_type" format="dita"/> is <codeph>UDP</codeph>
-        or <codeph>UDPIFC</codeph>. This number is multiplied by the number of segments to determine
-        the number of buckets in the hash table. Increasing the value may increase interconnect
-        performance for complex multi-slice queries (while consuming slightly more memory on the
-        segment hosts).</p>
+        connections with the default UDPIFC interconnect. This number is multiplied by the number of
+        segments to determine the number of buckets in the hash table. Increasing the value may
+        increase interconnect performance for complex multi-slice queries (while consuming slightly
+        more memory on the segment hosts).</p>
      <table id="gp_interconnect_hash_multiplier_table">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>
@@ -4114,14 +4113,13 @@
  <topic id="gp_interconnect_queue_depth">
    <title>gp_interconnect_queue_depth</title>
    <body>
-      <p>When <xref href="#gp_interconnect_type" format="dita"/> is <codeph>UDP</codeph> or
-          <codeph>UDPIFC</codeph>, sets the amount of data per-peer to be queued by the Greenplum
-        Database interconnect on receivers (when data is received but no space is available to
-        receive it the data will be dropped, and the transmitter will need to resend it). Increasing
-        the depth from its default value will cause the system to use more memory; but may increase
-        performance. It is reasonable for this to be set between 1 and 10. Queries with data skew
-        potentially perform better when this is increased. Increasing this may radically increase
-        the amount of memory used by the system.</p>
+      <p>Sets the amount of data per-peer to be queued by the Greenplum Database interconnect on
+        receivers (when data is received but no space is available to receive it the data will be
+        dropped, and the transmitter will need to resend it) for the default UDPIFC interconnect.
+        Increasing the depth from its default value will cause the system to use more memory, but
+        may increase performance. It is reasonable to set this value between 1 and 10. Queries with
+        data skew potentially perform better with an increased queue depth. Increasing this may
+        radically increase the amount of memory used by the system.</p>
      <table id="gp_interconnect_queue_depth_table">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>
@@ -4148,8 +4146,8 @@
  <topic id="gp_interconnect_setup_timeout">
    <title>gp_interconnect_setup_timeout</title>
    <body>
-      <p>When the <xref href="#gp_interconnect_type" format="dita"/> is <codeph>UDP</codeph>, the
-        time to wait for the Interconnect to complete setup before it times out.</p>
+      <note>This parameter is deprecated, as it applies only to an interconnect type  that is no
+        longer supported (<codeph>UDP</codeph>).</note>
      <table id="gp_interconnect_setup_timeout_table">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>
@@ -4176,13 +4174,11 @@
  <topic id="gp_interconnect_snd_queue_depth">
    <title>gp_interconnect_snd_queue_depth</title>
    <body>
-      <p>Sets the amount of data per-peer to be queued by the UDP interconnect on senders when <xref
-          href="#gp_interconnect_type" format="dita"/> is set to <codeph>UDPIFC</codeph>. Increasing
-        the depth from its default value will cause the system to use more memory; but may increase
-        performance. Reasonable values for this parameter are between 1 and 4. Increasing the value
-        might radically increase the amount of memory used by the system. For information about
-        interconnect types, see <xref href="#gp_interconnect_type" format="dita"
-          >gp_interconnect_type</xref>.</p>
+      <p>Sets the amount of data per-peer to be queued by the default UDPIFC interconnect on
+        senders. Increasing the depth from its default value will cause the system to use more
+        memory, but may increase performance. Reasonable values for this parameter are between 1 and
+        4. Increasing the value might radically increase the amount of memory used by the
+        system.</p>
      <table id="gp_interconnect_snd_queue_depth_table">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>
@@ -4209,17 +4205,12 @@
  <topic id="gp_interconnect_type">
    <title>gp_interconnect_type</title>
    <body>
-      <p>Sets the networking protocol used for Greenplum Database interconnect traffic. With the TCP
-        protocol, Greenplum Database has an upper limit of 1000 segment instances - less than that
-        if the query workload involves complex, multi-slice queries.</p>
-      <p>The UDP protocol allows for greater interconnect scalability. Note that the Greenplum
-        Database software does the additional packet verification and checking not performed by UDP,
-        so reliability and performance is equivalent to TCP.</p>
-      <p>UDPIFC specifies using UDP with flow control for interconnect traffic. Specify the
-        interconnect flow control method with <xref href="#gp_interconnect_fc_method" format="dita"
-        />.</p>
-      <note>The Greenplum Database interconnect types TCP and UDP are deprecated. In the next major
-        release, only the UDPIFC interconnect type will be supported by Greenplum Database. </note>
+      <p>Sets the networking protocol used for Greenplum Database interconnect traffic. UDPIFC
+        specifies using UDP with flow control for interconnect traffic, and is the only value
+        supported.</p>
+      <p>UDPIFC (the default) specifies using UDP with flow control for interconnect traffic. Specify the
+         interconnect flow control method with <xref href="#gp_interconnect_fc_method" format="dita"/>.</p>
+      <p>With TCP as the interconnect protocol, Greenplum Database has an upper limit of 1000 segment instances - less than that if the query workload involves complex, multi-slice queries.</p>
      <table id="table_jn5_frn_xv">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>
@@ -4234,7 +4225,7 @@
          </thead>
          <tbody>
            <row>
-              <entry colname="col1">TCP<p>UDP</p><p>UDPIFC</p></entry>
+              <entry colname="col1">UDPIFC<p>TCP</p></entry>
              <entry colname="col2">UDPIFC</entry>
              <entry colname="col3">local<p>system</p><p>restart</p></entry>
            </row>
@@ -4392,13 +4383,7 @@
  <topic id="gp_max_packet_size">
    <title>gp_max_packet_size</title>
    <body>
-      <p>Sets the size (in bytes) of messages sent by the UDP interconnect, and sets the
-        tuple-serialization chunk size when <xref href="#gp_interconnect_type" format="dita"/> is
-          <codeph>tcp</codeph>, <codeph>UDP</codeph> or <codeph>UDPIFC</codeph>.</p>
-      <note>The Greenplum Database interconnect types TCP and UDP are deprecated. In the next major
-        release, only the UDPIFC interconnect type will be supported by Greenplum Database. The
-        server configuration parameter <xref href="#gp_interconnect_type" type="section"
-          >gp_interconnect_type</xref> controls the interconnect type.</note>
+      <p>Sets the tuple-serialization chunk size for the interconnect.</p>
      <table id="gp_max_packet_size_table">
        <tgroup cols="3">
          <colspec colnum="1" colname="col1" colwidth="1*"/>

--- a/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml
+++ b/gpdb-doc/dita/ref_guide/config_params/guc_category-list.xml
@@ -1359,10 +1359,8 @@
            </stentry>
          </strow>
        </simpletable>
-        <note>The Greenplum Database interconnect types TCP and UDP are deprecated. In the next
-          major release, only the UDPIFC interconnect type will be supported by Greenplum Database.
-          The server configuration parameter <xref href="guc-list.xml#gp_interconnect_type"
-            type="section">gp_interconnect_type</xref> controls the interconnect type.</note>
+        <note>Greenplum Database supports only the UDPIFC (default) and TCP interconnect
+          types.</note>
      </body>
    </topic>
    <topic id="topic51" xml:lang="en">