> On July 4, 2016, 10:09 p.m., Sumit Mohanty wrote: > > ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml, > > line 144 > > <https://reviews.apache.org/r/49597/diff/1/?file=1436373#file1436373line144> > > > > Can we say - <on-ambari-upgrade delete="false"/> or simply keep it > > empty <on-ambari-upgrade /> > > Dmitro Lisnichenko wrote: > Empty <on-ambari-upgrade> or <on-ambari-upgrade delete="false"/> whould > mean add="true" (that is the default as of now, going to change in 2.5.0). > Also, as of now <deleted> tag implies <on-ambari-upgrade delete="true"/> > during ambari upgrade. Both proposed statements may look confusing. > > Sumit Mohanty wrote: > Ah! I missed that part where add has the default "true". > > Related question: > {quote}as of now <deleted> tag implies <on-ambari-upgrade > delete="true"/>{quote} > > Was that the behavior before 2.4.0, where if a property is marked > "<deleted>true</deleted>, Amabri upgrade will delete these property? > > Dmitro Lisnichenko wrote: > As I see from code, before 2.4.0 we did not handle that at all. If > property became deleted in stack, it was not processed (e.g. added/removed) > during Ambari upgrade. That does not sound right, I think. > > Sumit Mohanty wrote: > Generaly, properties are marked deleted for the "next" stack version - > e.g. its in HDP-2.3 but starting HDP-2.4, this property is no longer > available. So it needs to be processed when stack is being upgraded. So > Ambari upgrade need not delete this property. > > Another argument is that before Ambari upgrade the stack is functional > with the property - so after upgrade it should also remain functional even if > the property is not deleted. > > So keeping the same goal of Ambari upgrade should not impact stack > configurations, it seems alright to me that a stack "deleted" property should > not be automatically deleted on Ambari upgrade.
makes sense. Published new patch - Dmitro ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/49597/#review140697 ----------------------------------------------------------- On July 5, 2016, 6:02 p.m., Dmitro Lisnichenko wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/49597/ > ----------------------------------------------------------- > > (Updated July 5, 2016, 6:02 p.m.) > > > Review request for Ambari, Jonathan Hurley, Nate Cole, and Sumit Mohanty. > > > Bugs: AMBARI-17555 > https://issues.apache.org/jira/browse/AMBARI-17555 > > > Repository: ambari > > > Description > ------- > > As of now, delete=false directive of on-ambari-upgrade is used to indicate > that properties are no longer available. > We should bring back <deleted>true</deleted>. This is a directive for stack > inheritance. on-ambari-upgrade should only be used to indicate what happens > on ambari upgrade. > Also, I do not think there is any property as of now that needs to be deleted > during ambari upgrade. So on-ambari-upgrade directives should have > delete=false. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java > 543c1ec > > ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java > 167fefa > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java > 97c9967 > > ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml > 8c586a7 > > ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml > 7100389 > > ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml > d281569 > > ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml > 6519296 > > ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml > ca7fe2f > > ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml > 57052b8 > > ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml > 1fd3e83 > > ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml > 6b6c0bc > > ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml > 082cdde > > ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml > eda0fce > > ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml > c19d5ec > > ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml > 17bc454 > > ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml > 56b5752 > > ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml > 1743bf8 > > ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml > d0ee332 > > ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml > 03c8c83 > > ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-plugin-properties.xml > 116a8b2 > > ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml > c19d5ec > > ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml > 116a8b2 > > ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml > c19d5ec > > ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml > a71c111 > > ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml > c2bc06d > > ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml > 517a418 > > ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml > bf81ff9 > > ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml > 8a80485 > > ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/spark-defaults.xml > 61c938e > > ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml > 72c864d > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml > 909e3fc > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml > e76b474 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml > 0e2a254 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml > dc1aa88 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml > 61dd448 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml > 7853534 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml > 04282f1 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml > e40d902 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml > d770512 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml > 024e22a > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml > ed5b719 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml > 6636e74 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml > 57ad6e5 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml > 2aac7ad > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml > 7a3ec3a > > ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml > db3b998 > > ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml > 0877101 > > ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml > 1a00b41 > > ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/KNOX/configuration/knox-env.xml > 6ccab41 > > ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/YARN/configuration-mapred/mapred-site.xml > 749a0de > > ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HBASE/configuration/hbase-site.xml > 3ee199e > > ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-env.xml > 65a052e > > ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml > f2c41c3 > > ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/STORM/configuration/storm-site.xml > c8f48f6 > > ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/YARN/configuration/capacity-scheduler.xml > 47c957a > > ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml > 4d41766 > > ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml > f515e9c > > ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml > d7d5445 > > ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml > 723ed0f > > ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml > dde5fe8 > > ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml > dde5fe8 > > ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml > dde5fe8 > > Diff: https://reviews.apache.org/r/49597/diff/ > > > Testing > ------- > > Running unit tests and trying to perform upgrade on live cluster. > > > Thanks, > > Dmitro Lisnichenko > >
