Docs - further reorg of pl/container files

gpdb-doc/dita/analytics/analytics.ditamap

@@ -18,6 +18,7 @@
           <topicref href="pl_container.xml#upgrade_plcontainer" navtitle="Upgrade PL/Container" linking="none"/>
           <topicref href="pl_container.xml#uninstall_plcontainer" navtitle="Unistall PL/Container" linking="none"/>
           <topicref href="pl_container.xml#topic_kds_plk_rbb" navtitle="PL/Container References" linking="none"/>
+          <topicref href="pl_container_using.xml" linking="none"/>
           </topicref>
       <topicref href="pl_java.xml" linking="none"/>
       <topicref href="pl_perl.xml" linking="none"/>

gpdb-doc/dita/analytics/pl_container.xml

@@ -155,7 +155,7 @@
           <li>Make sure Greenplum Database is up and running:<codeblock>gpstate -s</codeblock>If
             it's not, start it:<codeblock>gpstart -a</codeblock></li>
           <li>Run the package installation
-            command:<codeblock>gppkg -i plcontainer-2.1.0-rhel7-x86_64.gppkg</codeblock></li>
+            command:<codeblock>gppkg -i plcontainer-2.1.1-rhel7-x86_64.gppkg</codeblock></li>
           <li>Source the file
             <codeph>$GPHOME/greenplum_path.sh</codeph>:<codeblock>source $GPHOME/greenplum_path.sh</codeblock></li>
           <li>Restart Greenplum Database:<codeblock>gpstop -ra</codeblock></li>
@@ -182,8 +182,8 @@
         <ul id="ul_h5t_sbz_vkb">
           <li>Download the tar.gz files that contain the Docker images from from <xref
               href="https://network.pivotal.io" format="html" scope="external">VMware Tanzu
-              Network</xref>. For example, for Greenplum 6.3, download PL/Container Docker Image
-              <b>for Python</b> with file name <b>plcontainer-python-image-2.1.0-gp6.tar.gz </b>
+              Network</xref>. For example, for Greenplum 6.5, download PL/Container Docker Image
+              <b>for Python</b> with file name <b>plcontainer-python-image-2.1.1-gp6.tar.gz </b>
             which includes Python 2.7.12 and the <i>Python Data Science Module Package</i>. <p>If
               you require different images from the ones provided by Pivotal, you can create custom
               Docker images, install the image and add the image to the PL/ Container configuration.
@@ -193,20 +193,20 @@
               install the images on all Greenplum Database hosts where  <codeph>-f
               </codeph>indicates the location of the downloaded files: </p>
             <codeblock># Install a Python 2 based Docker image
-plcontainer image-add -f /home/gpadmin/plcontainer-python-image-2.1.0-gp6.tar.gz
+plcontainer image-add -f /home/gpadmin/plcontainer-python-image-2.1.1-gp6.tar.gz
             
 # Install a Python 3 based Docker image
-plcontainer image-add -f /home/gpadmin/plcontainer-python3-image-2.1.0-gp6.tar.gz
+plcontainer image-add -f /home/gpadmin/plcontainer-python3-image-2.1.1-gp6.tar.gz
             
 # Install an R based Docker image
-plcontainer image-add -f /home/gpadmin/plcontainer-r-image-2.1.0-gp6.tar.gz</codeblock>
+plcontainer image-add -f /home/gpadmin/plcontainer-r-image-2.1.1-gp6.tar.gz</codeblock>
             <p>The utility displays progress information, similar to:</p>
             <codeblock>20200127:21:54:43:004607 plcontainer:mdw:gpadmin-[INFO]:-Checking whether docker is installed on all hosts...
 20200127:21:54:43:004607 plcontainer:mdw:gpadmin-[INFO]:-Distributing image file /home/gpadmin/plcontainer-python-images-1.5.0.tar to all hosts...
 20200127:21:54:55:004607 plcontainer:mdw:gpadmin-[INFO]:-Loading image on all hosts...
 20200127:21:55:37:004607 plcontainer:mdw:gpadmin-[INFO]:-Removing temporary image files on all hosts...</codeblock>
             <p>For more information on <codeph>image-add</codeph> options, visit the <xref
-                href="plcontainer_ref.xml#topic_rw3_52s_dw">plcontainer </xref> reference page. </p>
+                href="../utility_guide/ref/plcontainer.xml#topic_rw3_52s_dw">plcontainer </xref> reference page. </p>
           </li>
           <li>To display the installed Docker images on the local host use:
               <codeblock>$ plcontainer image-list</codeblock><simpletable frame="all"
@@ -254,7 +254,7 @@ plcontainer runtime-add -r plc_r_shared -i pivotaldata/plcontainer_r_shared:deve
             utility displays progress information as it updates the PL/Container configuration file
             on the Greenplum Database instances. <p>For details on other
                 <codeph>runtime-add</codeph> options, see the <xref
-                href="plcontainer_ref.xml#topic_rw3_52s_dw">plcontainer</xref> reference page.
+                href="../utility_guide/ref/plcontainer.xml#topic_rw3_52s_dw">plcontainer</xref> reference page.
             </p></li>
           <li>Optional: Use Greenplum Database resource groups to manage and limit the total CPU and
             memory resources of containers in PL/Container runtimes. In this example, the Python
@@ -330,8 +330,8 @@ $$ LANGUAGE plcontainer;</codeblock>
             <li>Use the Greenplum Database <codeph>gppkg</codeph> utility with the
                 <codeph>-u</codeph> option to update the PL/Container language extension. For
               example, the following command updates the PL/Container language extension to version
-              2.1.0 on a Linux
-              system:<codeblock>$ gppkg -u plcontainer-2.1.0-gp6-rhel7_x86_64.gppkg</codeblock></li>
+              2.1.1 on a Linux
+              system:<codeblock>$ gppkg -u plcontainer-2.1.1-gp6-rhel7_x86_64.gppkg</codeblock></li>
             <li>Source the Greenplum Database environment file
                 <codeph>$GPHOME/greenplum_path.sh</codeph>.<codeblock>$ source $GPHOME/greenplum_path.sh</codeblock></li>
             <li>Restore the PL/Container configuration that you saved in a previous step:
@@ -397,7 +397,7 @@ $$ LANGUAGE plcontainer;</codeblock>
           <li>Use the Greenplum Database <codeph>gppkg</codeph> utility with the <codeph>-r</codeph>
             option to uninstall the PL/Container language extension. This example uninstalls the
             PL/Container language extension on a Linux
-              system:<codeblock>$ gppkg -r plcontainer-2.1.0</codeblock><p>You can run the
+              system:<codeblock>$ gppkg -r plcontainer-2.1.1</codeblock><p>You can run the
                 <codeph>gppkg</codeph> utility with the options <codeph>-q --all</codeph> to list
               the installed extensions and their versions.</p></li>
           <li>Reload

gpdb-doc/dita/analytics/pl_container_using.xml

@@ -28,7 +28,7 @@
                     memory resources available to each container instance. The
                         <codeph>cpu_share</codeph> setting identifies the relative weighting of a
                     container's CPU usage compared to other containers. See <xref
-                        href="plcontainer-configuration-xml.xml" format="dita"/> for further
+                        href="../utility_guide/ref/plcontainer-configuration.xml" format="dita"/> for further
                     details.</p>
                 <p>You cannot, by default, restrict the number of executing PL/Container container
                     instances, nor can you restrict the total amount of memory or CPU resources that
@@ -87,7 +87,7 @@
                     <codeblock>plcontainer runtime-add -r python_run1 -i pivotaldata/plcontainer_python_shared:devel -l python -s resource_group_id=16391</codeblock></p>
                 <p>You can also assign a resource group to a PL/Container runtime using the
                         <codeph>plcontainer runtime-edit</codeph> command. For information about the
-                        <codeph>plcontainer</codeph> command, see <xref href="plcontainer_ref.xml"
+                        <codeph>plcontainer</codeph> command, see <xref href="../utility_guide/ref/plcontainer.xml"
                         format="dita"/> reference page.</p>
                 <p>After you assign a resource group to a PL/Container runtime, all container
                     instances that share the same runtime configuration are subject to the memory
@@ -154,7 +154,7 @@
                         <codeblock>plcontainer runtime-add -r python_run1 -i pivotaldata/plcontainer_python_shared:devel -l python -s resource_group_id=16391
                                     plcontainer runtime-replace -r r_run1 -i pivotaldata/plcontainer_r_shared:devel -l r -s resource_group_id=16393</codeblock><p>For
                         information about the <codeph>plcontainer</codeph> command, see <xref
-                            href="plcontainer_ref.xml" format="dita"/> reference page.</p></li>
+                            href="../utility_guide/ref/plcontainer.xml" format="dita"/> reference page.</p></li>
             </ol></section>
             
             <section id="plc_notes">
@@ -236,7 +236,7 @@
                     configuration file <codeph>plcontainer_configuration.xml</codeph>, there is a
                         <codeph>runtime</codeph> XML element that contains a corresponding
                         <codeph>id</codeph> XML element that specifies the Docker container startup
-                    information. See <xref href="plcontainer-configuration-xml.xml#topic_sk1_gdq_dw"
+                    information. See <xref href="../utility_guide/ref/plcontainer-configuration.xml#topic_sk1_gdq_dw"
                         format="dita"/> for information about how PL/Container maps the
                         <varname>ID</varname> to a Docker image. See <xref href="#topic_kwg_qfg_mjb"
                         format="dita"/> for example UDF definitions.</p>
@@ -323,7 +323,7 @@
                     Docker image to be started. If you configured PL/Container with a different ID,
                     change the value of the <codeph># container</codeph> line. For information about
                     configuring PL/Container and viewing the configuration settings, see <xref
-                        href="plcontainer-configuration-xml.xml" format="dita"/>.</p>
+                        href="../utility_guide/ref/plcontainer-configuration.xml" format="dita"/>.</p>
                 <p>This is an example of PL/Python function that runs using the
                         <codeph>plc_python_shared</codeph> container that contains Python
                     2:<codeblock>CREATE OR REPLACE FUNCTION pylog100() RETURNS double precision AS $$

gpdb-doc/dita/analytics/plcontainer-configuration-xml.xml → gpdb-doc/dita/utility_guide/ref/plcontainer-configuration.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">
 <topic id="topic_sk1_gdq_dw">
-      <title>PL/Container Configuration File</title>
+      <title>plcontainer Configuration File</title>
       <body>
                 <p>The Greenplum Database utility <codeph>plcontainer</codeph> manages the
                     PL/Container configuration files in a Greenplum Database system. The utility
@@ -213,7 +213,7 @@
                                                 runtime configuration, its container instances are
                                                 limited only by system resources. For information
                                                 about managing PL/Container resources, see <xref
-                                                  href="pl_container_using.xml#topic_resmgmt"
+                                                  href="../../analytics/pl_container_using.xml#topic_resmgmt"
                                                   format="dita">About PL/Container Resource
                                                   Management</xref>.</pd>
                                                 </plentry>
@@ -243,12 +243,12 @@
                                                   logging (the default). </pd>
                                                   <pd>The Greenplum Database server configuration
                                                 parameter <codeph><xref
-                                                  href="../ref_guide/config_params/guc-list.xml#log_min_messages"
-                                                  scope="peer">log_min_messages</xref></codeph>
+                                                  href="../../ref_guide/config_params/guc-list.xml#log_min_messages"
+                                                  scope="local">log_min_messages</xref></codeph>
                                                 controls the PL/Container log level. The default log
                                                 level is <codeph>warning</codeph>. For information
                                                 about PL/Container log information, see <xref
-                                                  href="pl_container_using.xml#plc_notes"
+                                                  href="../../analytics/pl_container_using.xml#plc_notes"
                                                   format="dita">Notes</xref>.</pd>
                                                   <pd>
                                                   <p>By default, the PL/Container log information is

gpdb-doc/dita/analytics/plcontainer_ref.xml → gpdb-doc/dita/utility_guide/ref/plcontainer.xml

@@ -146,7 +146,7 @@
                         for the container. The value is either <codeph>yes</codeph> (enable logging)
                         or <codeph>no</codeph> (disable logging, the default). <p>The Greenplum
                           Database server configuration parameter <codeph><xref
-                              href="../ref_guide/config_params/guc-list.xml#log_min_messages"
+                              href="../../ref_guide/config_params/guc-list.xml#log_min_messages"
                               scope="peer">log_min_messages</xref></codeph> controls the log level.
                           The default log level is <codeph>warning</codeph>. For information about
                           PL/Container log information, see <xref href="#plc_notes" format="dita"

gpdb-doc/dita/utility_guide/utility_guide.ditamap

@@ -59,6 +59,8 @@
         <topicref href="ref/pgbouncer.xml"/>
         <topicref href="ref/pgbouncer-ini.xml"/>
         <topicref href="ref/pgbouncer-admin.xml"/>
+            <topicref href="ref/plcontainer.xml"/>
+            <topicref href="ref/plcontainer-configuration.xml"/>
         <topicref href="ref/psql.xml"/>
         <topicref href="../pxf/ref/pxf.html" scope="peer" navtitle="pxf"/>
         <topicref href="../pxf/ref/pxf-cluster.html" scope="peer" navtitle="pxf cluster"/>