Repository: ambari Updated Branches: refs/heads/branch-2.2 8b49b71d5 -> 4bc6a52a4 refs/heads/trunk fb8f34855 -> 064f1d195
AMBARI-15737. Ambari DB schema upgrade fails with ORA-01408 error (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/064f1d19 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/064f1d19 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/064f1d19 Branch: refs/heads/trunk Commit: 064f1d195ea86b8a6478fab65b55a4a4bdab51f3 Parents: fb8f348 Author: Andrew Onishuk <[email protected]> Authored: Wed Apr 6 18:58:04 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Apr 6 18:58:04 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java | 2 +- .../org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/064f1d19/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java index 6a6a5ef..77b8b45 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java @@ -293,7 +293,7 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog { } protected void updateHostRoleCommands() throws SQLException { - dbAccessor.createIndex("idx_hrc_status", "host_role_command", "status", "role"); + dbAccessor.createIndex("idx_hrc_status_role", "host_role_command", "status", "role"); } protected void updateAMSConfigs() throws AmbariException { http://git-wip-us.apache.org/repos/asf/ambari/blob/064f1d19/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java index de906ac..5f07e56 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java @@ -585,7 +585,7 @@ public class UpgradeCatalog222Test { @Test public void testUpdateHostRoleCommands() throws Exception { final DBAccessor dbAccessor = createNiceMock(DBAccessor.class); - dbAccessor.createIndex(eq("idx_hrc_status"), eq("host_role_command"), eq("status"), eq("role")); + dbAccessor.createIndex(eq("idx_hrc_status_role"), eq("host_role_command"), eq("status"), eq("role")); expectLastCall().once(); replay(dbAccessor);
