You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/06/28 00:38:33 UTC

ambari git commit: AMBARI-12178 - Memory Exhausted During Upgrade Of Large Cluster (part2) (jonathanhurley)

Repository: ambari
Updated Branches:
  refs/heads/trunk cd9ed4623 -> b079040d8


AMBARI-12178 - Memory Exhausted During Upgrade Of Large Cluster (part2) (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: b079040d89e92a14dfd1ba51cda22b34f661f1e6
Parents: cd9ed46
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Sat Jun 27 18:37:57 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Sat Jun 27 18:38:05 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/ambari/server/orm/dao/StageDAO.java | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b079040d/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
index 4b0056e..83c2c44 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
@@ -42,6 +42,8 @@ import org.apache.ambari.server.orm.entities.StageEntity;
 import org.apache.ambari.server.orm.entities.StageEntityPK;
 import org.apache.ambari.server.orm.entities.StageEntity_;
 import org.apache.ambari.server.utils.StageUtils;
+import org.eclipse.persistence.config.HintValues;
+import org.eclipse.persistence.config.QueryHints;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -206,6 +208,12 @@ public class StageDAO {
     query.orderBy(sortOrders);
 
     TypedQuery<StageEntity> typedQuery = entityManager.createQuery(query);
+
+    // !!! https://bugs.eclipse.org/bugs/show_bug.cgi?id=398067
+    // ensure that an associated entity with a JOIN is not stale; this causes
+    // the associated StageEntity to be stale
+    typedQuery.setHint(QueryHints.REFRESH, HintValues.TRUE);
+
     return daoUtils.selectList(typedQuery);
   }