You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2013/06/27 19:20:48 UTC

svn commit: r1497461 - /incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Author: ncole
Date: Thu Jun 27 17:20:48 2013
New Revision: 1497461

URL: http://svn.apache.org/r1497461
Log:
AMBARI-2503. Added 'from' version in config change log (ncole)

Modified:
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1497461&r1=1497460&r2=1497461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Thu Jun 27 17:20:48 2013
@@ -1439,13 +1439,15 @@ public class AmbariManagementControllerI
 
       Config baseConfig = cluster.getConfig(cr.getType(), cr.getVersionTag());
       if (null != baseConfig) {
+        Config oldConfig = cluster.getDesiredConfigByType(cr.getType());
         String authName = getAuthName();
         if (cluster.addDesiredConfig(authName, baseConfig)) {
           Logger logger = LoggerFactory.getLogger("configchange");
           logger.info("cluster '" + request.getClusterName() + "' "
               + "changed by: '" + authName + "'; "
               + "type='" + baseConfig.getType() + "' "
-              + "tag='" + baseConfig.getVersionTag() + "'");
+              + "tag='" + baseConfig.getVersionTag() + "'"
+              + (null == oldConfig ? "" : " from='"+ oldConfig.getVersionTag() + "'"));
         }
       }
     }
@@ -3011,13 +3013,16 @@ public class AmbariManagementControllerI
           Config baseConfig = c.getConfig(cr.getType(), cr.getVersionTag());
           if (null != baseConfig) {
             String authName = getAuthName();
+            DesiredConfig oldConfig = h.getDesiredConfigs(c.getClusterId()).get(cr.getType());
+            
             if (h.addDesiredConfig(c.getClusterId(), cr.isSelected(), authName,  baseConfig)) {
               Logger logger = LoggerFactory.getLogger("configchange");
               logger.info("cluster '" + c.getClusterName() + "', "
                   + "host '" + h.getHostName() + "' "
                   + "changed by: '" + authName + "'; "
                   + "type='" + baseConfig.getType() + "' "
-                  + "tag='" + baseConfig.getVersionTag() + "'");
+                  + "tag='" + baseConfig.getVersionTag() + "'"
+                  + (null == oldConfig ? "" : ", from='" + oldConfig.getVersion() + "'"));
             }
           }