You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ambari.apache.org by "Jonathan Hurley (JIRA)" <ji...@apache.org> on 2017/09/25 12:40:01 UTC
[jira] [Comment Edited] (AMBARI-22007) Addition of service
component after patching a service still keeps the component at base
version
[ https://issues.apache.org/jira/browse/AMBARI-22007?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16178963#comment-16178963 ]
Jonathan Hurley edited comment on AMBARI-22007 at 9/25/17 12:39 PM:
--------------------------------------------------------------------
This is crazy bizarre. When I re-apply the patch from reviewboard, it shows no changes (even though there are changes in there for script.py and version_select_util.py). This seems like some kind of crazy git bug or something...
{code}
# git apply -3 < ~/Downloads/AMBARI-22007.patch
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java:46
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java:1284
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java:87
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java:124
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java:99
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java:146
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java:320
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java' cleanly.
error: patch failed: ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java:32
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java' with conflicts.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql:155
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql:175
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql:156
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql:159
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql:154
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql:168
Falling back to three-way merge...
Applied patch to 'ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql' cleanly.
error: patch failed: ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java:306
Falling back to three-way merge...
Applied patch to 'ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java' cleanly.
error: patch failed: ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java:49
Falling back to three-way merge...
Applied patch to 'ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java' cleanly.
error: patch failed: ambari-server/src/test/python/TestVersionSelectUtil.py:40
Falling back to three-way merge...
Applied patch to 'ambari-server/src/test/python/TestVersionSelectUtil.py' cleanly.
U ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
Recorded preimage for 'ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java'
{code}
{code:title=less ~/Downloads/AMBARI-22007.patch}
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
index 9fbb42bec5..73b5dc1a4c 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
@@ -28,10 +28,11 @@ from resource_management.core import shell
from resource_management.libraries.functions import stack_tools
-def get_component_version(stack_name, component_name):
+def get_component_version_from_symlink(stack_name, component_name):
"""
{code}
was (Author: jonathan.hurley):
This is crazy bizarre. When I re-apply the patch from reviewboard, it shows no changes (even though there are changes in there for script.py and version_select_util.py). This seems like some kind of crazy git bug or something...
> Addition of service component after patching a service still keeps the component at base version
> ------------------------------------------------------------------------------------------------
>
> Key: AMBARI-22007
> URL: https://issues.apache.org/jira/browse/AMBARI-22007
> Project: Ambari
> Issue Type: Bug
> Components: ambari-server
> Affects Versions: 2.6.0
> Reporter: Vivek Sharma
> Assignee: Jonathan Hurley
> Priority: Critical
> Labels: patch-upgrade
> Fix For: 2.6.0
>
> Attachments: AMBARI-22007.patch
>
>
> *STR*
> # Deploy HDP-2.6.0.0 cluster with Ambari-2.6.0.0 (2.6.0.0-102)
> # Register VDF for Storm PU to 2.6.0.3-8
> # Perform a patch RU for Storm
> # Revert the patch
> # Perform a patch EU for Storm
> # Add Supervisor component on one of the hosts
> # Observe the version of Supervisor on newly added host
> *Result:*
> Supervisor still shows its version as the base version
> Looks like the issue is because while installing packages for Supervisor, hdp-select sets it at base-version
> {code}
> 2017-09-19 11:20:33,011 - Execute[('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.6.0.0-598')] {'sudo': True}
> 2017-09-19 11:20:33,061 - After ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'storm-supervisor', '2.6.0.0-598'), reloaded module params
> {code}
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)