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


Patch doesnt apply to latest in trunk. Can you refresh the patch?

hw11039:ambari jluniya$ git apply ~/Downloads/AMBARI-8317.8.patch
error: patch failed: ambari-server/src/main/python/ambari-server-windows.py:285
error: ambari-server/src/main/python/ambari-server-windows.py: patch does not 
apply
error: patch failed: 
ambari-server/src/main/python/ambari_server/dbConfiguration.py:31
error: ambari-server/src/main/python/ambari_server/dbConfiguration.py: patch 
does not apply
error: patch failed: 
ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py:41
error: ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py: 
patch does not apply
error: patch failed: 
ambari-server/src/main/python/ambari_server/serverConfiguration.py:119
error: ambari-server/src/main/python/ambari_server/serverConfiguration.py: 
patch does not apply
error: patch failed: 
ambari-server/src/main/python/ambari_server/serverSetup_windows.py:1
error: ambari-server/src/main/python/ambari_server/serverSetup_windows.py: 
patch does not apply
error: patch failed: 
ambari-server/src/main/python/ambari_server/setupSecurity.py:24
error: ambari-server/src/main/python/ambari_server/setupSecurity.py: patch does 
not apply

- Jayush Luniya


On Jan. 16, 2015, 9:43 p.m., Florian Barca wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/29983/
> -----------------------------------------------------------
> 
> (Updated Jan. 16, 2015, 9:43 p.m.)
> 
> 
> Review request for Ambari, Artem Baranchuk, Eugene Chekanskiy, Jonathan 
> Hurley, Jayush Luniya, Mahadev Konar, and Nate Cole.
> 
> 
> Bugs: AMBARI-8317
>     https://issues.apache.org/jira/browse/AMBARI-8317
> 
> 
> Repository: ambari
> 
> 
> Description
> -------
> 
> +Further decomposing ambari-server.py: Moved setup, reset and upgrade into 
> their own files
> +Made them OS-independent - now the same routines are being used in Windows 
> too (save upgrade, which is not active in Windows yet)
> +Merged the OS-dependent code for JDBC & JDK setup, database interface 
> creation, firewall checks
> +Refactored the database setup: split the supported DBMSes into distinct 
> objects
> +Replaced recursive calls in the user input routines
> 
> 
> Diffs
> -----
> 
>   ambari-common/src/main/python/ambari_commons/firewall.py 
> 76d9890a8edc2902c1f2c145626b6b6e41836573 
>   ambari-common/src/main/python/ambari_commons/inet_utils.py 
> 2a54cb6867aec65d6400451ab12e30c146193cfa 
>   ambari-common/src/main/python/ambari_commons/logging_utils.py 
> af1390cc4643d3b2e80f0cdf3697babcc48eb23a 
>   ambari-server/conf/unix/ambari.properties 
> e29a6e25f576a8f806a447a4cf03c56f4d0c105b 
>   ambari-server/conf/windows/ambari.properties 
> ec4da55f7d955a96a601454ea2790a7334b6a438 
>   ambari-server/src/main/python/ambari-server-windows.py 
> acd91ab32a1a35a278ca964c34e79fd36a84639c 
>   ambari-server/src/main/python/ambari-server.py 
> ba3d5e73045e12f89ba039c3f2d64d1afb8b0f1b 
>   ambari-server/src/main/python/ambari_server/dbConfiguration.py 
> daa84abbfe507aafacb4f5e4f81be3864a2ea0e6 
>   ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py 
> 62853b72787c14be8717e786f6f43c391c8901c8 
>   ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py 
> 19e874256b1dc78d6ec69f1111d6cb9bf1dfc392 
>   ambari-server/src/main/python/ambari_server/serverConfiguration.py 
> 2aba514e25cc212405cd3f5d9ed3a0d5070f92eb 
>   ambari-server/src/main/python/ambari_server/serverSetup.py 
> 7d4544595396ecbe9bdb663deea124d7842bbacd 
>   ambari-server/src/main/python/ambari_server/serverSetup_linux.py 
> 33241515f6648f8a066f090ec6a98493008ff092 
>   ambari-server/src/main/python/ambari_server/serverSetup_windows.py 
> 68145f2ce6bc09e3feb7941e32140f06c8151904 
>   ambari-server/src/main/python/ambari_server/serverUpgrade.py PRE-CREATION 
>   ambari-server/src/main/python/ambari_server/setupActions.py 
> ee8eaa07fee924ec46a6edc828ea9dc4686fbdc5 
>   ambari-server/src/main/python/ambari_server/setupSecurity.py 
> 277dd129b31afac76c336400f7dbc000b401406f 
>   ambari-server/src/main/python/ambari_server/userInput.py 
> 3e8b2c74b28212b3fcc552d1697087f8101f6c74 
>   ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
> 10c0073267bee014fb9a88bef4de10b655dceb99 
>   
> ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-ANY/scripts/setup_jdk.py
>  d48bb523e9ff4d8c81d42fed25d0043e75a0e3cb 
>   
> ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/mapred_service_check.py
>  f81408f546a90e07ed3a1434b7d6e8f62fa62966 
>   ambari-server/src/test/python/TestAmbariServer.py 
> a8f419701202af8807f2bcbe6fc95e12b05e3cb5 
> 
> Diff: https://reviews.apache.org/r/29983/diff/
> 
> 
> Testing
> -------
> 
> mvn clean test
> 
> ambari-server setup (--silent, --verbose) ->start -> ui ok
> ambari-server reset ->start -> ui ok
> ambari-server upgrade ->start -> ui ok
> 
> 
> Thanks,
> 
> Florian Barca
> 
>

Reply via email to