AMBARI-17449. When querying host role command entities, the number of parameters should be limited. (Daniel Gergely via magyari_sandor)

ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -777,6 +777,14 @@ public class Configuration {
    */
   public static final String METRIC_RETRIEVAL_SERVICE_THREADPOOL_WORKER_QUEUE_SIZE = "server.metrics.retrieval-service.threadpool.worker.size";
 
+  /**
+   * The number of tasks that can be queried from the database at once
+   * In the case of more tasks, multiple queries are issued
+   * @return
+   */
+  private static final String TASK_ID_LIST_LIMIT = "task.query.parameterlist.size";
+  private static final int TASK_ID_LIST_LIMIT_DEFAULT = 999;
+
   private static final Logger LOG = LoggerFactory.getLogger(
     Configuration.class);
 
@@ -3216,4 +3224,14 @@ public class Configuration {
             String.valueOf(10 * getMetricsServiceThreadPoolMaxSize())));
   }
 
+  /**
+   * Returns the number of tasks that can be queried from the database at once
+   * In the case of more tasks, multiple queries are issued
+   * @return
+   */
+  public int getTaskIdListLimit() {
+    return Integer.parseInt(properties.getProperty(TASK_ID_LIST_LIMIT,
+            String.valueOf(TASK_ID_LIST_LIMIT_DEFAULT)));
+  }
+
 }

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java

@@ -37,8 +37,6 @@ public class DaoUtils {
   @Inject
   private DBAccessor dbAccessor;
 
-  public static final int ORACLE_LIST_LIMIT = 999;
-
   public DbType getDbType() {
     return dbAccessor.getDbType();
   }

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java

@@ -18,9 +18,6 @@
 
 package org.apache.ambari.server.orm.dao;
 
-import static org.apache.ambari.server.orm.DBAccessor.DbType.ORACLE;
-import static org.apache.ambari.server.orm.dao.DaoUtils.ORACLE_LIST_LIMIT;
-
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,6 +43,7 @@ import org.apache.ambari.server.RoleCommand;
 import org.apache.ambari.server.actionmanager.HostRoleStatus;
 import org.apache.ambari.server.api.query.JpaPredicateVisitor;
 import org.apache.ambari.server.api.query.JpaSortBuilder;
+import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.spi.PageRequest;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.Request;
@@ -138,10 +136,13 @@ public class HostRoleCommandDAO {
 
 
   @Inject
-  Provider<EntityManager> entityManagerProvider;
+  private Provider<EntityManager> entityManagerProvider;
+
+  @Inject
+  private DaoUtils daoUtils;
 
   @Inject
-  DaoUtils daoUtils;
+  private Configuration configuration;
 
   /**
    * Used to ensure that methods which rely on the completion of
@@ -278,10 +279,10 @@ public class HostRoleCommandDAO {
         "ORDER BY task.taskId",
       HostRoleCommandEntity.class);
 
-    if (daoUtils.getDbType().equals(ORACLE) && taskIds.size() > ORACLE_LIST_LIMIT) {
+    if (taskIds.size() > configuration.getTaskIdListLimit()) {
       List<HostRoleCommandEntity> result = new ArrayList<HostRoleCommandEntity>();
 
-      List<List<Long>> lists = Lists.partition(new ArrayList<Long>(taskIds), ORACLE_LIST_LIMIT);
+      List<List<Long>> lists = Lists.partition(new ArrayList<Long>(taskIds), configuration.getTaskIdListLimit());
       for (List<Long> list : lists) {
         result.addAll(daoUtils.selectList(query, list));
       }
@@ -348,10 +349,10 @@ public class HostRoleCommandDAO {
             "ORDER BY task.taskId", Long.class
     );
 
-    if (daoUtils.getDbType().equals(ORACLE) && taskIds.size() > ORACLE_LIST_LIMIT) {
+    if (taskIds.size() > configuration.getTaskIdListLimit()) {
       List<Long> result = new ArrayList<Long>();
 
-      List<List<Long>> lists = Lists.partition(new ArrayList<Long>(taskIds), ORACLE_LIST_LIMIT);
+      List<List<Long>> lists = Lists.partition(new ArrayList<Long>(taskIds), configuration.getTaskIdListLimit());
       for (List<Long> taskIdList : lists) {
         result.addAll(daoUtils.selectList(query, requestIds, taskIdList));
       }