Browse Source

AMBARI-9537 Ambari is dead after upgrade 1.4.4->2.0.0 OracleDB (dsen)

Dmytro Sen 10 years ago
parent
commit
a2b3b4c52d

+ 3 - 3
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java

@@ -164,7 +164,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog {
     columns.add(new DBColumnInfo("alert_state", String.class, 255, null, false));
     dbAccessor.createTable(ALERT_TARGET_STATES_TABLE, columns, "target_id");
     dbAccessor.addFKConstraint(ALERT_TARGET_STATES_TABLE,
-        "fk_alert_target_states_target_id", "target_id", ALERT_TARGET_TABLE,
+        "fk_alert_tgt_states_tgt_id", "target_id", ALERT_TARGET_TABLE,
         "target_id", false);
 
     // update alert current maintenance mode
@@ -288,8 +288,8 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog {
     columns.add(new DBColumnInfo("principal_name", String.class, 255, null, false));
     columns.add(new DBColumnInfo("host_name", String.class, 255, null, false));
     dbAccessor.createTable(KERBEROS_PRINCIPAL_HOST_TABLE, columns, "principal_name", "host_name");
-    dbAccessor.addFKConstraint(KERBEROS_PRINCIPAL_HOST_TABLE, "FK_kerberosprincipalhost_hostname", "host_name", "hosts", "host_name", false);
-    dbAccessor.addFKConstraint(KERBEROS_PRINCIPAL_HOST_TABLE, "FK_kerberosprincipalhost_principalname", "principal_name", KERBEROS_PRINCIPAL_TABLE, "principal_name", false);
+    dbAccessor.addFKConstraint(KERBEROS_PRINCIPAL_HOST_TABLE, "FK_krb_pr_host_hostname", "host_name", "hosts", "host_name", false);
+    dbAccessor.addFKConstraint(KERBEROS_PRINCIPAL_HOST_TABLE, "FK_krb_pr_host_principalname", "principal_name", KERBEROS_PRINCIPAL_TABLE, "principal_name", false);
   }
 
   // ----- UpgradeCatalog ----------------------------------------------------

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql

@@ -613,11 +613,11 @@ CREATE TABLE kerberos_principal_host (
 );
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_hostname
+ADD CONSTRAINT FK_krb_pr_host_hostname
 FOREIGN KEY (host_name) REFERENCES hosts (host_name) ON DELETE CASCADE;
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_principalname
+ADD CONSTRAINT FK_krb_pr_host_principalname
 FOREIGN KEY (principal_name) REFERENCES kerberos_principal (principal_name) ON DELETE CASCADE;
 -- Kerberos (end)
 

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql

@@ -603,11 +603,11 @@ CREATE TABLE kerberos_principal_host (
 );
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_hostname
+ADD CONSTRAINT FK_krb_pr_host_hostname
 FOREIGN KEY (host_name) REFERENCES hosts (host_name) ON DELETE CASCADE;
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_principalname
+ADD CONSTRAINT FK_krb_pr_host_principalname
 FOREIGN KEY (principal_name) REFERENCES kerberos_principal (principal_name) ON DELETE CASCADE;
 -- Kerberos (end)
 

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql

@@ -600,11 +600,11 @@ CREATE TABLE kerberos_principal_host (
 );
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_hostname
+ADD CONSTRAINT FK_krb_pr_host_hostname
 FOREIGN KEY (host_name) REFERENCES hosts (host_name) ON DELETE CASCADE;
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_principalname
+ADD CONSTRAINT FK_krb_pr_host_principalname
 FOREIGN KEY (principal_name) REFERENCES kerberos_principal (principal_name) ON DELETE CASCADE;
 -- Kerberos (end)
 

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql

@@ -676,11 +676,11 @@ CREATE TABLE ambari.kerberos_principal_host (
 GRANT ALL PRIVILEGES ON TABLE ambari.kerberos_principal_host TO :username;
 
 ALTER TABLE ambari.kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_hostname
+ADD CONSTRAINT FK_krb_pr_host_hostname
 FOREIGN KEY (host_name) REFERENCES ambari.hosts (host_name) ON DELETE CASCADE;
 
 ALTER TABLE ambari.kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_principalname
+ADD CONSTRAINT FK_krb_pr_host_principalname
 FOREIGN KEY (principal_name) REFERENCES ambari.kerberos_principal (principal_name) ON DELETE CASCADE;
 -- Kerberos (end)
 

+ 2 - 2
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql

@@ -178,11 +178,11 @@ CREATE TABLE kerberos_principal_host (
 );
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_hostname
+ADD CONSTRAINT FK_krb_pr_host_hostname
 FOREIGN KEY (host_name) REFERENCES hosts (host_name) ON DELETE CASCADE;
 
 ALTER TABLE kerberos_principal_host
-ADD CONSTRAINT FK_kerberosprincipalhost_principalname
+ADD CONSTRAINT FK_krb_pr_host_principalname
 FOREIGN KEY (principal_name) REFERENCES kerberos_principal (principal_name) ON DELETE CASCADE;
 -- Kerberos (end)
 

+ 2 - 2
ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java

@@ -220,9 +220,9 @@ public class UpgradeCatalog200Test {
     // kerberos_principal_host
     dbAccessor.createTable(eq("kerberos_principal_host"), capture(kerberosPrincipalHostCapture),
         eq("principal_name"), eq("host_name"));
-    dbAccessor.addFKConstraint(eq("kerberos_principal_host"), eq("FK_kerberosprincipalhost_hostname"),
+    dbAccessor.addFKConstraint(eq("kerberos_principal_host"), eq("FK_krb_pr_host_hostname"),
         eq("host_name"), eq("hosts"), eq("host_name"), eq(false));
-    dbAccessor.addFKConstraint(eq("kerberos_principal_host"), eq("FK_kerberosprincipalhost_principalname"),
+    dbAccessor.addFKConstraint(eq("kerberos_principal_host"), eq("FK_krb_pr_host_principalname"),
         eq("principal_name"), eq("kerberos_principal"), eq("principal_name"), eq(false));
 
     setViewInstancePropertyExpectations(dbAccessor, valueColumnCapture);