> On April 13, 2016, 2:53 p.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java, > > line 128 > > <https://reviews.apache.org/r/46147/diff/1/?file=1342673#file1342673line128> > > > > Does this cause an empty sub resource rendering in the JSON?
It should not. In my initial testing, I haven't seen any cases where an empty property set was attached to the resource. In the case of LogSearch not being available, there's no logging metadata to attach to the resource, so returning the passed-in resources seemed appropriate. - Robert ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/46147/#review128684 ----------------------------------------------------------- On April 13, 2016, 2:28 p.m., Robert Nettleton wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/46147/ > ----------------------------------------------------------- > > (Updated April 13, 2016, 2:28 p.m.) > > > Review request for Ambari, Jonathan Hurley, Oliver Szabo, and Sumit Mohanty. > > > Bugs: AMBARI-15861 > https://issues.apache.org/jira/browse/AMBARI-15861 > > > Repository: ambari > > > Description > ------- > > This patch resolves AMBARI-15861. > > Last night's checkin of the initial LogSearch integration code in Ambari > caused a NullPointerException to occur in cluster deployments when LogSearch > is not available. Currently, that would account for most deployment attempts > on trunk, so this issue will block successful cluster deployments on trunk > until it is resolved. > > This patch implements the following > > 1. Adds a check for a null LoggingRequestHelper in the > LoggingSearchPropertyProvider implementation. > 2. Implements a new unit test to verify this fix. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java > 6b4a8a4 > > ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProviderTest.java > 19c0756 > > Diff: https://reviews.apache.org/r/46147/diff/ > > > Testing > ------- > > 1. I manually verified that applying this fix to a trunk build will allow a > successful cluster deployment to occur, with no NullPointerExceptions > occurring, and I verified that the services started seem to be > installed/started as expected. > 2. Currently running ambari-server's "mvn clean test" suite, and will update > with results once that is completed. > > > Thanks, > > Robert Nettleton > >
