Repository: ambari Updated Branches: refs/heads/trunk 4ed70c31e -> a3728c4cb
AMBARI-5038. Fix issues appeared after upgrading to 1.5.0. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a3728c4c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3728c4c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3728c4c Branch: refs/heads/trunk Commit: a3728c4cb547d6dc4faa4e2cde46a7edea58bf05 Parents: 4ed70c3 Author: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Authored: Tue Mar 11 22:39:34 2014 +0200 Committer: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Committed: Tue Mar 11 22:39:43 2014 +0200 ---------------------------------------------------------------------- .../server/controller/ganglia/GangliaPropertyProvider.java | 8 ++++---- .../java/org/apache/ambari/server/orm/dao/RequestDAO.java | 6 ++++++ .../org/apache/ambari/server/upgrade/UpgradeCatalog150.java | 1 + .../java/org/apache/ambari/server/upgrade/UpgradeTest.java | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a3728c4c/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java index 514c586..b81c024 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java @@ -477,7 +477,7 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider { return Collections.emptySet(); } - while(!dsName.equals("[~EOF]")) { + while(!"[~EOF]".equals(dsName)) { GangliaMetric metric = new GangliaMetric(); List<GangliaMetric.TemporalMetric> listTemporalMetrics = new ArrayList<GangliaMetric.TemporalMetric>(); @@ -493,18 +493,18 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider { String val = reader.readLine(); String lastVal = null; - while(! val.equals("[~EOM]")) { + while(val!=null && !"[~EOM]".equals(val)) { if (val.startsWith("[~r]")) { Integer repeat = Integer.valueOf(val.substring(4)) - 1; for (int i = 0; i < repeat; ++i) { - if (! lastVal.equals("[~n]")) { + if (! "[~n]".equals(lastVal)) { GangliaMetric.TemporalMetric tm = new GangliaMetric.TemporalMetric(lastVal, time); if (tm.isValid()) listTemporalMetrics.add(tm); } time += step; } } else { - if (! val.equals("[~n]")) { + if (! "[~n]".equals(val)) { GangliaMetric.TemporalMetric tm = new GangliaMetric.TemporalMetric(val, time); if (tm.isValid()) listTemporalMetrics.add(tm); } http://git-wip-us.apache.org/repos/asf/ambari/blob/a3728c4c/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java index 50cb0fb..2c30695 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java @@ -23,6 +23,7 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.orm.entities.RequestEntity; +import org.apache.ambari.server.orm.entities.RequestResourceFilterEntity; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; @@ -53,6 +54,11 @@ public class RequestDAO { } @Transactional + public List<RequestResourceFilterEntity> findAllResourceFilters() { + return daoUtils.selectAll(entityManagerProvider.get(), RequestResourceFilterEntity.class); + } + + @Transactional public boolean isAllTasksCompleted(long requestId) { TypedQuery<Long> query = entityManagerProvider.get().createQuery( "SELECT task.taskId FROM HostRoleCommandEntity task WHERE task.requestId = ?1 AND " + http://git-wip-us.apache.org/repos/asf/ambari/blob/a3728c4c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java index 942bad9..f8a7a4f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java @@ -202,6 +202,7 @@ public class UpgradeCatalog150 extends AbstractUpgradeCatalog { // RequestResourceFilter columns.clear(); + columns.add(new DBColumnInfo("filter_id", Long.class, null, null, false)); columns.add(new DBColumnInfo("request_id", Long.class, null, null, false)); columns.add(new DBColumnInfo("service_name", String.class, 255, null, true)); columns.add(new DBColumnInfo("component_name", String.class, 255, null, true)); http://git-wip-us.apache.org/repos/asf/ambari/blob/a3728c4c/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java index e840839..a46e95a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java @@ -133,7 +133,9 @@ public class UpgradeTest { injector.getInstance(HostStateDAO.class).findAll(); injector.getInstance(KeyValueDAO.class).findAll(); injector.getInstance(MetainfoDAO.class).findAll(); - injector.getInstance(RequestDAO.class).findAll(); + RequestDAO requestDAO = injector.getInstance(RequestDAO.class); + requestDAO.findAll(); + requestDAO.findAllResourceFilters(); injector.getInstance(RequestScheduleBatchRequestDAO.class).findAll(); injector.getInstance(RequestScheduleDAO.class).findAll(); injector.getInstance(RoleDAO.class).findAll();
