Repository: ambari Updated Branches: refs/heads/trunk a94098651 -> f94ff9b27
AMBARI-7117. sqoop_user is not available in sqoop-env after upgrade(1.6.0->1.7.0)(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f94ff9b2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f94ff9b2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f94ff9b2 Branch: refs/heads/trunk Commit: f94ff9b27a48ebfbfae77045603bbe28b1cbc167 Parents: a940986 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Tue Sep 2 21:39:52 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Tue Sep 2 21:39:52 2014 +0300 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java | 2 ++ .../org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f94ff9b2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java index 0ac9da7..c2dec57 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java @@ -767,6 +767,8 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog { updateConfigurationProperties("yarn-env", Collections.singletonMap("min_user_id", "1000"), false, false); + + updateConfigurationProperties("sqoop-env", Collections.singletonMap("sqoop_user", "sqoop"), false, false); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/f94ff9b2/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java index e2ce75e..cc97114 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java @@ -297,6 +297,9 @@ public class UpgradeCatalog170Test { Collections.singletonMap("min_user_id", "1000"), false, false); expectLastCall(); + upgradeCatalog.updateConfigurationProperties("sqoop-env", Collections.singletonMap("sqoop_user", "sqoop"), false, false); + expectLastCall(); + expect(dbAccessor.executeSelect("SELECT role_name, user_id FROM user_roles")).andReturn(userRolesResultSet).once(); expect(entityManager.getTransaction()).andReturn(trans).anyTimes(); expect(entityManager.getCriteriaBuilder()).andReturn(cb).anyTimes();
