You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/04/24 21:01:09 UTC
[1/3] ambari git commit: AMBARI-10735. Error on clicking 'Deploy' in
the Install wizard. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 0dd082156 -> f9d488b48
AMBARI-10735. Error on clicking 'Deploy' in the Install wizard. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9d488b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9d488b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9d488b4
Branch: refs/heads/trunk
Commit: f9d488b4868dc40e30d76192e9c2d27732160da3
Parents: 00cd61a
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Apr 24 19:56:35 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Apr 24 22:00:54 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f9d488b4/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
index a57ef1f..7df1e2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
@@ -133,13 +133,13 @@ public class ClusterDAO {
* @return the highest existing value of the version column + 1
*/
public Long findNextConfigVersion(long clusterId, String configType) {
- TypedQuery<Long> query = entityManagerProvider.get().createNamedQuery(
- "ClusterConfigEntity.findNextConfigVersion", Long.class);
+ TypedQuery<Number> query = entityManagerProvider.get().createNamedQuery(
+ "ClusterConfigEntity.findNextConfigVersion", Number.class);
query.setParameter("clusterId", clusterId);
query.setParameter("configType", configType);
- return daoUtils.selectSingle(query);
+ return daoUtils.selectSingle(query).longValue();
}
/**
[2/3] ambari git commit: AMBARI-10734. PostgreSQL External schema
syntax error. (mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-10734. PostgreSQL External schema syntax error. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00cd61a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00cd61a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00cd61a9
Branch: refs/heads/trunk
Commit: 00cd61a9fcde78e0dc8eedeb77b67afa34771245
Parents: 3e776a5
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Apr 24 19:51:41 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Apr 24 22:00:54 2015 +0300
----------------------------------------------------------------------
ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/00cd61a9/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index c3f8c1c..8b1aaad 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -537,7 +537,7 @@ CREATE TABLE repo_version (
upgrade_package VARCHAR(255) NOT NULL,
repositories TEXT NOT NULL,
PRIMARY KEY(repo_version_id),
- FOREIGN KEY (stack_id) REFERENCES stack(stack_id));
+ FOREIGN KEY (stack_id) REFERENCES stack(stack_id)
);
CREATE TABLE widget (
[3/3] ambari git commit: AMBARI-10733. Saving config groups cause
ambari server exceptions. (mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-10733. Saving config groups cause ambari server exceptions. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3e776a51
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e776a51
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e776a51
Branch: refs/heads/trunk
Commit: 3e776a51165cd56cd59dee02236ed88e3825c10a
Parents: 0dd0821
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Apr 24 19:49:57 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Apr 24 22:00:54 2015 +0300
----------------------------------------------------------------------
.../internal/ServiceConfigVersionResourceProvider.java | 2 +-
.../org/apache/ambari/server/orm/dao/ClusterDAO.java | 1 +
.../main/java/org/apache/ambari/server/state/Config.java | 2 ++
.../java/org/apache/ambari/server/state/ConfigImpl.java | 11 +++++++----
.../ambari/server/state/configgroup/ConfigGroupImpl.java | 1 +
5 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e776a51/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
index 52113ff..6ce904b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
@@ -230,7 +230,7 @@ public class ServiceConfigVersionResourceProvider extends
subResourceMap.put("type", config.getType());
subResourceMap.put("tag", config.getVersionTag());
subResourceMap.put("version", config.getVersion());
- subResourceMap.put("properties", new TreeMap(config.getConfigs()));
+ subResourceMap.put("properties", new TreeMap<String, String>(config.getConfigs()));
subResourceMap.put("properties_attributes", config.getConfigAttributes());
result.add(subResourceMap);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e776a51/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
index 35a1700..a57ef1f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.orm.dao;
+import java.math.BigDecimal;
import java.util.List;
import javax.persistence.EntityManager;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e776a51/ambari-server/src/main/java/org/apache/ambari/server/state/Config.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Config.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Config.java
index 7eeea7d..502e1bf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Config.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Config.java
@@ -26,6 +26,8 @@ import java.util.Map;
*/
public interface Config {
+ void setStackId(StackId stackId);
+
/**
* @return Config Type
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e776a51/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
index 4a62ff6..6866b0c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
@@ -47,15 +47,12 @@ public class ConfigImpl implements Config {
private Map<String, String> properties;
private Map<String, Map<String, String>> propertiesAttributes;
private ClusterConfigEntity entity;
-
@Inject
private ClusterDAO clusterDAO;
@Inject
private Gson gson;
@Inject
private ServiceConfigDAO serviceConfigDAO;
-
-
@AssistedInject
public ConfigImpl(@Assisted Cluster cluster, @Assisted String type, @Assisted Map<String, String> properties,
@Assisted Map<String, Map<String, String>> propertiesAttributes, Injector injector) {
@@ -72,6 +69,7 @@ public class ConfigImpl implements Config {
}
+
@AssistedInject
public ConfigImpl(@Assisted Cluster cluster, @Assisted ClusterConfigEntity entity, Injector injector) {
this.cluster = cluster;
@@ -97,11 +95,16 @@ public class ConfigImpl implements Config {
* {@inheritDoc}
*/
@Override
- public StackId getStackId() {
+ public synchronized StackId getStackId() {
return stackId;
}
@Override
+ public synchronized void setStackId(StackId stackId) {
+ this.stackId = stackId;
+ }
+
+ @Override
public String getType() {
return type;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e776a51/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
index 4c5d016..656c452 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
@@ -406,6 +406,7 @@ public class ConfigGroupImpl implements ConfigGroup {
if (clusterConfigEntity == null) {
config.setVersion(cluster.getNextConfigVersion(config.getType()));
+ config.setStackId(cluster.getDesiredStackVersion());
// Create configuration
clusterConfigEntity = new ClusterConfigEntity();
clusterConfigEntity.setClusterId(clusterEntity.getClusterId());