ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: Revert "AMBARI-12657 - Cluster creates fail on larger deployments with SQL Azure DB (jonathanhurley)"
Date Fri, 07 Aug 2015 15:14:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 fb454fc3b -> 12568c1fe


Revert "AMBARI-12657 - Cluster creates fail on larger deployments with SQL Azure DB (jonathanhurley)"

This reverts commit 654b409ea561b24524878760232cde6528d243a0.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12568c1f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12568c1f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12568c1f

Branch: refs/heads/branch-2.1
Commit: 12568c1fec8c4179cb9289613cc7300cab540162
Parents: fb454fc
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Aug 7 11:13:59 2015 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Fri Aug 7 11:14:16 2015 -0400

----------------------------------------------------------------------
 .../org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/12568c1f/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
index 71e6ab2..afa3c08 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAO.java
@@ -78,7 +78,7 @@ public class HostRoleCommandDAO {
    * SQL template to get all requests which have had all of their tasks
    * COMPLETED
    */
-  private static final String COMPLETED_REQUESTS_SQL = "SELECT DISTINCT task.requestId FROM
HostRoleCommandEntity task WHERE task.status NOT IN :notCompletedStatuses ORDER BY task.requestId
{0}";
+  private static final String COMPLETED_REQUESTS_SQL = "SELECT DISTINCT task.requestId FROM
HostRoleCommandEntity task WHERE NOT EXISTS (SELECT task.requestId FROM HostRoleCommandEntity
task WHERE task.status IN :notCompletedStatuses) ORDER BY task.requestId {0}";
 
   @Inject
   Provider<EntityManager> entityManagerProvider;
@@ -376,9 +376,9 @@ public class HostRoleCommandDAO {
 
   @Transactional
   public void removeByHostId(Long hostId) {
-    Collection<HostRoleCommandEntity> commands = findByHostId(hostId);
+    Collection<HostRoleCommandEntity> commands = this.findByHostId(hostId);
     for (HostRoleCommandEntity cmd : commands) {
-      remove(cmd);
+      this.remove(cmd);
     }
   }
 


Mime
View raw message