[impala] branch master updated: IMPALA-12332: Undo IMPALA-8615 as the corresponding configs have been removed

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asherman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new a24897269 IMPALA-12332: Undo IMPALA-8615 as the corresponding configs have been removed
a24897269 is described below

commit a24897269d35c1ec012709c4d515aac687243124
Author: Andrew Sherman <as...@cloudera.com>
AuthorDate: Wed Aug 2 18:24:05 2023 -0700

    IMPALA-12332: Undo IMPALA-8615 as the corresponding configs have been removed
    
    IMPALA-8615 documented the changes made in IMPALA-8536, but the configs
    were subsequently removed in IMPALA-9077. Rollback IMPALA-8615 to bring
    the docs up to date.
    
    Revert "IMPALA-8615: [DOCS] Document the scalable admission control parameters"
    This was a clean revert, and there were no overlapping changes to this file.
    
    TESTING:
    - built docs and reviewed the file.
    
    This reverts commit b2136c39fcafacec308dc9dd13ad13133596d05d.
    
    Change-Id: Ibc856c62babb4b305b6a7c286a0f4c86e6e418cc
    Reviewed-on: http://gerrit.cloudera.org:8080/20308
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 docs/topics/impala_admission.xml | 42 ++++++----------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/docs/topics/impala_admission.xml b/docs/topics/impala_admission.xml
index df99ed53e..58aef0d24 100644
--- a/docs/topics/impala_admission.xml
+++ b/docs/topics/impala_admission.xml
@@ -102,39 +102,19 @@ under the License.
               still use <uicontrol>Max Running Queries</uicontrol> as a
               safeguard. If queries exceed either the total estimated memory or
               the maximum number of concurrent queries, they are added to the
-              queue. </p><p>If <uicontrol>Max Running Queries
-                Multiple</uicontrol> is set, the <uicontrol>Max Running
-                Queries</uicontrol> setting is ignored.</p>
+              queue. </p>
           </dd>
         </dlentry>
-        <dlentry>
-          <dt>Max Running Queries Multiple</dt>
-          <dd>This floating point number is multiplied by the current total
-            number of executors at runtime to give the maximum number of
-            concurrently running queries allowed in the pool. The effect of this
-            setting scales with the number of executors in the resource
-              pool.<p>This calculation is rounded up to the nearest integer, so
-              the result will always be at least one. </p><p>If set to zero or a
-              negative number, the setting is ignored.</p></dd>
-        </dlentry>
+      </dl>
+      <dl>
         <dlentry>
           <dt> Max Queued Queries </dt>
           <dd> Maximum number of queries that can be queued in this pool. The
             default value is 200 for Impala 2.1 or higher and 50 for previous
-            versions of Impala. (optional)<p>If <uicontrol>Max Queued Queries
-                Multiple</uicontrol> is set, the <uicontrol>Max Queued
-                Queries</uicontrol> setting is ignored.</p></dd>
-        </dlentry>
-        <dlentry>
-          <dt>Max Queued Queries Multiple</dt>
-          <dd>This floating point number is multiplied by the current total
-            number of executors at runtime to give the maximum number of queries
-            that can be queued in the pool. The effect of this setting scales
-            with the number of executors in the resource pool.<p>This
-              calculation is rounded up to the nearest integer, so the result
-              will always be at least one. </p><p>If set to zero or a negative
-              number, the setting is ignored.</p></dd>
+            versions of Impala. (optional)</dd>
         </dlentry>
+      </dl>
+      <dl>
         <dlentry>
           <dt> Queue Timeout </dt>
           <dd> The amount of time, in milliseconds, that a query waits in the
@@ -236,18 +216,8 @@ under the License.
                   query.</li>
               </ul>
             </p>
-            <p>If <uicontrol>Max Memory Multiple</uicontrol> is set, the
-                <uicontrol>Max Memory</uicontrol> setting is ignored.</p>
           </dd>
         </dlentry>
-        <dlentry>
-          <dt>Max Memory Multiple</dt>
-          <dd> This number of bytes is multiplied by the current total number of
-            executors at runtime to give the maximum memory available across the
-            cluster for the pool. The effect of this setting scales with the
-            number of executors in the resource pool.<p>If set to zero or a
-              negative number, the setting is ignored.</p></dd>
-        </dlentry>
         <dlentry>
           <dt>Minimum Query Memory Limit and Maximum Query Memory Limit</dt>
           <dd>