-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46147/
-----------------------------------------------------------

(Updated April 13, 2016, 3:51 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 (updated)
-------

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.

Test Results:

The "mvn clean test" suite in ambari-server did have some failures:

"Failed tests:
  UpgradeCatalog240Test.testExecuteDDLUpdates:227
  Unexpected method call DBAccessor.addColumn("viewinstanceentity", 
org.apache.ambari.server.orm.DBAccessor$DBColumnInfo@4574042f):
    DBAccessor.addColumn("host_role_command", 
capture(org.apache.ambari.server.orm.DBAccessor$DBColumnInfo@3473076d)): 
expected: 1, actual: 1
  ViewDirectoryWatcherTest.testDirectoryExtractionOnFileAdd:111
  Expectation failure on verify:
    
ViewRegistry.readViewArchive(/var/folders/7l/3g9wc3qn4t36xr465lhmrk0c0000gp/T/test_dir/file.jar):
 expected: 1, actual: 0
Tests in error:
  AmbariManagementControllerTest.testUpdateRepoUrlController:8524 ยป 
IllegalArgument

Tests run: 4217, Failures: 2, Errors: 1, Skipped: 32"

These tests are also failing in trunk without my patch applied, so I went 
forward with a merge, since these failures were already present in trunk.


Thanks,

Robert Nettleton

Reply via email to