----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/46692/ -----------------------------------------------------------
(Updated Квітень 28, 2016, 8:54 до полудня) Review request for Ambari, Dmytro Sen and Sumit Mohanty. Bugs: AMBARI-16094 https://issues.apache.org/jira/browse/AMBARI-16094 Repository: ambari Description ------- * disable (we can remove later) DatabaseCheck * Have CheckDatabaseHelper be called as part of ambari-server start ** Modify {{ambari-server start}} to so that it calls {{ambari-server check-database}} *ambari-server check-database improvements* * On the output modify {{Ambari Server 'check-database' completed successfully.}} to {{Ambari Server 'check-database' completed.}} - _remove successfully_ * Use “--skip-database-check” (not skip-database-validation) to force ambari-server to start despite error * If there is error when check-database is run then use the following text {code} DB configs consistency check failed. Run “ambari-server start --skip-database-check” to skip. If you use this “--skip-database-check” option, do not make any changes to your cluster topology or perform a cluster upgrade until you correct the database consistency issues. See "/var/log/ambari-server/ambari-check-database.log" for more details on the consistency issues. {code} *ambari-server start improvements* * On Ambari Server start, the output failure text to should mention ambari-server.log (in addition to .out file it does today) * If user has not specified {{--skip-database-check}} fail start command if check-database reports error * When user starts server with --skip-database-check, if there are DB check errors, print message: {code} Ambari Server is starting with the database consistency check skipped. Do not make any changes to your cluster topology or perform a cluster upgrade until you correct the database consistency issues. See "/var/log/ambari-server/ambari-check-database.log" for more details on the consistency issues. {code} When using log file paths, make sure to use the right path from log4j. *Optional* Modify ambari.properties to add {{database_check_error_skipped=true}} if user started with {{--skip-database-check}} and there were errors due to database-check. If there are no errors then store {{database_check_error_skipped=false}}. Eventually, UI will use this property and show warnings to the user and even prevent HDP upgrade or other topology modifying operations such as Add Host/Service. Diffs (updated) ----- ambari-server/conf/unix/log4j.properties 3cb7fd0 ambari-server/conf/windows/log4j.properties 8beba68 ambari-server/src/main/conf/log4j.properties 5021c77 ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDatabaseHelper.java 6ed0c08 ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java PRE-CREATION ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyChecker.java PRE-CREATION ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java 0527cbc ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java 91d6b4d ambari-server/src/main/python/ambari-server.py d211e9c ambari-server/src/main/python/ambari_server/checkDatabase.py 2b5c735 ambari-server/src/main/python/ambari_server/serverConfiguration.py d815365 ambari-server/src/main/python/ambari_server_main.py cd0b858 ambari-server/src/test/java/org/apache/ambari/server/checks/CheckDatabaseHelperTest.java 8d801dc ambari-server/src/test/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelperTest.java PRE-CREATION ambari-server/src/test/python/TestAmbariServer.py 9f17e91 Diff: https://reviews.apache.org/r/46692/diff/ Testing ------- mvn clean test Thanks, Vitalyi Brodetskyi