Explorar o código

AMBARI-5622. Upgrading schema failed during upgrading to 1.6.0. (Myroslav Papirkovskyy via swagle)

Siddharth Wagle %!s(int64=11) %!d(string=hai) anos
pai
achega
8277003296

+ 1 - 1
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog150.java

@@ -851,7 +851,7 @@ public class UpgradeCatalog150 extends AbstractUpgradeCatalog {
     return "insert into request" +
     return "insert into request" +
       "(request_id, cluster_id, request_context, start_time, end_time, create_time) " +
       "(request_id, cluster_id, request_context, start_time, end_time, create_time) " +
       "select distinct s.request_id, s.cluster_id, s.request_context, " +
       "select distinct s.request_id, s.cluster_id, s.request_context, " +
-      "coalesce (cmd.start_time, -1), coalesce (cmd.end_time, -1), -1 " +
+      "coalesce(cmd.start_time, -1), coalesce(cmd.end_time, -1), -1 " +
       "from " +
       "from " +
       "(select distinct request_id, cluster_id, request_context from stage ) s " +
       "(select distinct request_id, cluster_id, request_context from stage ) s " +
       "left join " +
       "left join " +

+ 8 - 1
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java

@@ -69,8 +69,15 @@ public class UpgradeCatalog160 extends AbstractUpgradeCatalog {
 
 
     //=========================================================================
     //=========================================================================
     // Add columns
     // Add columns
+    //TODO type converters are not supported by DBAccessor currently, default value will be provided to query as is in most cases
+    DBAccessor.DBColumnInfo restartRequiredColumn =
+      new DBAccessor.DBColumnInfo("restart_required", Boolean.class, 1, 0, false);
+    if (Configuration.POSTGRES_DB_NAME.equals(getDbType())) {
+      //only postgres supports boolean type
+      restartRequiredColumn.setDefaultValue(Boolean.FALSE);
+    }
     dbAccessor.addColumn("hostcomponentdesiredstate",
     dbAccessor.addColumn("hostcomponentdesiredstate",
-      new DBAccessor.DBColumnInfo("restart_required", Boolean.class, 1, 0, false));
+      restartRequiredColumn);
 
 
     // ========================================================================
     // ========================================================================
     // Add constraints
     // Add constraints