----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/40815/#review108528 -----------------------------------------------------------
May be good to incorporate this into the unit test. - Alejandro Fernandez On Dec. 1, 2015, 11:05 a.m., Swapan Shridhar wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/40815/ > ----------------------------------------------------------- > > (Updated Dec. 1, 2015, 11:05 a.m.) > > > Review request for Ambari and Alejandro Fernandez. > > > Bugs: AMBARi-14122 > https://issues.apache.org/jira/browse/AMBARi-14122 > > > Repository: ambari > > > Description > ------- > > Fixing the 'Falcon - Oozie Integration' issue where 7 property values are not > filled and shown mandatory during Express and Rolling Upgrade > > Problem : > ------- > > * While doing Express/Rolling upgrade, with Oozie as one of the service and > specifically excluding FALCON as one of the service, a new set of 7 > properties under "Falcon - Oozie Integration" are introduced. > * They are marked 'mandatory' but don't have a value associated. Therefore, > these properties get shown as RED on UI (as they are mandatory.) > > Reason for this behavior : > ------------------------- > > * In DELETE operation of 'upgrade-<version>.xml', we specifically direct to > retain certain properties for Oozie-falcon integration using 'keep-key' > directive. > > * That's the place we ask it to retain the following 7 properties which > become the source of problem, as they don't exist and 'keep-key' was actually > creating them, and finally they were there without any value associated with > them. > oozie.service.ELService.ext.functions.coord-job-submit-instances, > oozie.service.ELService.ext.functions.coord-action-create-inst, > oozie.service.ELService.ext.functions.coord-action-create, > oozie.service.ELService.ext.functions.coord-job-submit-data, > oozie.service.ELService.ext.functions.coord-action-start, > oozie.service.ELService.ext.functions.coord-sla-submit, > oozie.service.ELService.ext.functions.coord-sla-create > > * The properties are part of the 'falcon-oozie integration', and this problem > surfaces only when we are upgrading and "Falcon" service is not present. We > were adding them, without checking whether these properties themselves exist > at the first place. > > Fix : > ---- > > * Fixed the code in ConfigureAction.java where in case of DELETE, it checks > for 'key' existence before adding/retaining it as part of 'keep-key' in > Upgrade. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java > 706f9c6 > > Diff: https://reviews.apache.org/r/40815/diff/ > > > Testing > ------- > > - EU and RU with OOZIE, Hadoop, MR, ZK and YARN : Works fine. > - EU with OOZIE, FALCON, Hadoop, MR, ZK and YARN : Works fine. > - UT : passes. > > > Thanks, > > Swapan Shridhar > >
