You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/06/15 19:58:34 UTC
ambari git commit: AMBARI-11930 Perf Cluster: Repo Version install
stuck in INSTALLING state (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fe0e7e0e2 -> 06437ac04
AMBARI-11930 Perf Cluster: Repo Version install stuck in INSTALLING state (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/06437ac0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06437ac0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06437ac0
Branch: refs/heads/branch-2.1
Commit: 06437ac0485e9891cc452bc6b3e043cd56a2e102
Parents: fe0e7e0
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Jun 15 20:57:40 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Jun 15 20:57:40 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/orm/dao/RepositoryVersionDAO.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/06437ac0/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index 3040309..45626fb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.persistence.TypedQuery;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
@@ -77,7 +78,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
/**
* Retrieves repository version by stack.
*
- * @param stack stack
+ * @param stackEntity Stack entity
* @param version version
* @return null if there is no suitable repository version
*/
@@ -126,7 +127,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
/**
* Retrieves repository version by stack.
*
- * @param stack
+ * @param stackId stack id
* stack with major version (like HDP-2.2)
* @return null if there is no suitable repository version
*/
@@ -140,7 +141,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
/**
* Validates and creates an object.
- * @param stack Stack name, e.g., HDP or HDP-2.2
+ * @param stackEntity Stack entity
* @param version Stack version, e.g., 2.2 or 2.2.0.1-885
* @param displayName Unique display name
* @param upgradePack Optional upgrade pack, e.g, upgrade-2.2
@@ -148,6 +149,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
* @return Returns the object created if successful, and throws an exception otherwise.
* @throws AmbariException
*/
+ @Transactional
public RepositoryVersionEntity create(StackEntity stackEntity,
String version, String displayName, String upgradePack,
String operatingSystems) throws AmbariException {
@@ -183,6 +185,7 @@ public class RepositoryVersionDAO extends CrudDAO<RepositoryVersionEntity, Long>
* @param version the version to find
* @return the matching repo version entity
*/
+ @RequiresSession
public RepositoryVersionEntity findMaxByVersion(String version) {
List<RepositoryVersionEntity> list = findByVersion(version);
if (null == list || 0 == list.size()) {