This is an automated email from the ASF dual-hosted git repository. wuzhiguo pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 506470c670 AMBARI-25379 Upgrade AMS Grafana version to 6.4.2 (#3472) 506470c670 is described below commit 506470c6704fbcdda38c1b742746877da9401657 Author: lucasbak <lucas.bakal...@gmail.com> AuthorDate: Tue Nov 8 19:33:14 2022 +0100 AMBARI-25379 Upgrade AMS Grafana version to 6.4.2 (#3472) --- .../apache/ambari/server/state/PropertyUpgradeBehavior.java | 10 ++++++++++ .../apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 1 + .../org/apache/ambari/server/upgrade/UpgradeCatalog275.java | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java index 2a704b819a..87f9a9ab31 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java @@ -82,4 +82,14 @@ public class PropertyUpgradeBehavior { public boolean isUpdate() { return update; } + + + @Override + public String toString() { + return "PropertyUpgradeBehavior{" + + "add=" + add + + ", delete=" + delete + + ", update=" + update + + '}'; + } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index 730a26bfee..5bef9048bb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -426,6 +426,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { for (PropertyInfo property : properties) { String configType = ConfigHelper.fileNameToConfigType(property.getFilename()); PropertyUpgradeBehavior upgradeBehavior = property.getPropertyAmbariUpgradeBehavior(); + LOG.debug("Property: {}, Config Type: {}", property, configType); if (property.isDeleted()) { // Do nothing diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog275.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog275.java index 35bcc82d16..c863964995 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog275.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog275.java @@ -27,16 +27,20 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.orm.dao.BlueprintDAO; import org.apache.ambari.server.orm.entities.BlueprintConfigEntity; import org.apache.ambari.server.orm.entities.BlueprintEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.gson.Gson; import com.google.inject.Inject; import com.google.inject.Injector; + /** * The {@link UpgradeCatalog275} upgrades Ambari from 2.7.4 to 2.7.5. */ public class UpgradeCatalog275 extends AbstractUpgradeCatalog { + private static final Logger LOG = LoggerFactory.getLogger(UpgradeCatalog275.class); static final Gson GSON = new Gson(); @@ -63,7 +67,7 @@ public class UpgradeCatalog275 extends AbstractUpgradeCatalog { */ @Override protected void executeDDLUpdates() throws AmbariException, SQLException { - + // no actions needed } /** @@ -74,6 +78,7 @@ public class UpgradeCatalog275 extends AbstractUpgradeCatalog { */ @Override protected void executePreDMLUpdates() throws AmbariException, SQLException { + LOG.debug("UpgradeCatalog275 executing Pre-DML Updates."); removeDfsHAInitial(); } @@ -85,6 +90,7 @@ public class UpgradeCatalog275 extends AbstractUpgradeCatalog { */ @Override protected void executeDMLUpdates() throws AmbariException, SQLException { + LOG.debug("UpgradeCatalog275 executing DML Updates."); addNewConfigurationsFromXml(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org For additional commands, e-mail: commits-h...@ambari.apache.org