----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/44352/#review123513 -----------------------------------------------------------
Ship it! Ship It! - Sumit Mohanty On March 14, 2016, 10 p.m., Nahappan Somasundaram wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/44352/ > ----------------------------------------------------------- > > (Updated March 14, 2016, 10 p.m.) > > > Review request for Ambari, Jonathan Hurley, Zhe (Joe) Wang, Nate Cole, Sumit > Mohanty, and Sid Wagle. > > > Bugs: AMBARI-15230 > https://issues.apache.org/jira/browse/AMBARI-15230 > > > Repository: ambari > > > Description > ------- > > AMBARI-15230: Move default recovery properties from ambari.properties to > cluster-env.xml > > **Changes**: > > 1. Moved all *recovery* properties from ambari.properties to cluster-env.xml > 2. Moved Configuration properties for recovery from Configuration.java to a > new class ClusterEnvConfig > 3. Populate RecoveryConfig from ClusterEnvConfig instead of Configuration. > 4. Modified existing unit tests > 5. Added new unit tests > > > Diffs > ----- > > ambari-server/conf/unix/ambari.properties > 92dec2480025cf7e2148da7db327814ef25207c1 > > ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java > a13b4211e7dfffc678d8e8f55fa892bc71eca7e1 > > ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfig.java > 3da86092ffd0477ea37d73f5fa9f5de857ec0908 > > ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryConfigHelper.java > PRE-CREATION > > ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java > 43fdfe4fe68900f31e984e1a1681978bdd7cff98 > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java > 2a062a779a651c33190dd0aa77a560e7e38aac4b > > ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java > 98dc1b793e95b5f9612d0e5ba465227083b8e804 > > ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml > 3fb82e9dcf5afe0af0088385ce73b53f96962940 > > ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java > a5a3cb5bb7639a1e9e11ed66dcf30a76152a8175 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java > e29e23ef61db6d238d0944529c2c4cbd0e227116 > > ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java > PRE-CREATION > > Diff: https://reviews.apache.org/r/44352/diff/ > > > Testing > ------- > > 1. ** mvn clean install -DskipTests ** > > [INFO] > ------------------------------------------------------------------------ > [INFO] Reactor Summary: > [INFO] > [INFO] Ambari Main ....................................... SUCCESS [6.883s] > [INFO] Apache Ambari Project POM ......................... SUCCESS [0.037s] > [INFO] Ambari Web ........................................ SUCCESS [22.487s] > [INFO] Ambari Views ...................................... SUCCESS [1.023s] > [INFO] Ambari Admin View ................................. SUCCESS [5.445s] > [INFO] ambari-metrics .................................... SUCCESS [0.339s] > [INFO] Ambari Metrics Common ............................. SUCCESS [0.418s] > [INFO] Ambari Metrics Hadoop Sink ........................ SUCCESS [1.039s] > [INFO] Ambari Metrics Flume Sink ......................... SUCCESS [0.554s] > [INFO] Ambari Metrics Kafka Sink ......................... SUCCESS [0.607s] > [INFO] Ambari Metrics Storm Sink ......................... SUCCESS [1.784s] > [INFO] Ambari Metrics Collector .......................... SUCCESS [6.406s] > [INFO] Ambari Metrics Monitor ............................ SUCCESS [1.590s] > [INFO] Ambari Metrics Grafana ............................ SUCCESS [0.788s] > [INFO] Ambari Metrics Assembly ........................... SUCCESS [1:07.649s] > [INFO] Ambari Server ..................................... SUCCESS [2:04.674s] > [INFO] Ambari Functional Tests ........................... SUCCESS [0.914s] > [INFO] Ambari Agent ...................................... SUCCESS [20.697s] > [INFO] Ambari Client ..................................... SUCCESS [0.041s] > [INFO] Ambari Python Client .............................. SUCCESS [0.820s] > [INFO] Ambari Groovy Client .............................. SUCCESS [1.929s] > [INFO] Ambari Shell ...................................... SUCCESS [0.033s] > [INFO] Ambari Python Shell ............................... SUCCESS [0.546s] > [INFO] Ambari Groovy Shell ............................... SUCCESS [0.809s] > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 4:28.131s > [INFO] Finished at: Mon Mar 14 14:25:34 PDT 2016 > [INFO] Final Memory: 250M/1202M > [INFO] > ------------------------------------------------------------------------ > > 2. CD into ambari-server directory and execute **mvn clean test**: > > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 58:26.773s > [INFO] Finished at: Thu Mar 03 11:22:15 PST 2016 > [INFO] Final Memory: 35M/574M > [INFO] > ------------------------------------------------------------------------ > > 3. ** Manual tests ** > > * Replaced ambari-server JAR in a VM running ambari from **trunk** > * Replaced cluster-env.xml on target VM. > * Debugged ambari-server and verified that ambari-agent was able to get > **METRICS_COLLECTOR** as a component to be enabled for auto start. > > > Thanks, > > Nahappan Somasundaram > >
