Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9F420200D16 for ; Tue, 10 Oct 2017 15:42:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9DBB1160BE0; Tue, 10 Oct 2017 13:42:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E52AB1609E5 for ; Tue, 10 Oct 2017 15:42:17 +0200 (CEST) Received: (qmail 67572 invoked by uid 500); 10 Oct 2017 13:42:17 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 67563 invoked by uid 99); 10 Oct 2017 13:42:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2017 13:42:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F3277F5AD6; Tue, 10 Oct 2017 13:42:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Message-Id: <017bf647031746baa85199ae6aaf37f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-22178. Install and upgrade options are shown for current and already upgraded stack versions (ncole) Date: Tue, 10 Oct 2017 13:42:16 +0000 (UTC) archived-at: Tue, 10 Oct 2017 13:42:18 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.6 81216fe93 -> c3c4cadac AMBARI-22178. Install and upgrade options are shown for current and already upgraded stack versions (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3c4cada Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3c4cada Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3c4cada Branch: refs/heads/branch-2.6 Commit: c3c4cadac2f223d3817cbe6ea0245f71e449e886 Parents: 81216fe Author: Nate Cole Authored: Mon Oct 9 17:15:33 2017 -0400 Committer: Nate Cole Committed: Tue Oct 10 08:35:56 2017 -0400 ---------------------------------------------------------------------- .../upgrade/HostVersionOutOfSyncListener.java | 11 +++++++++++ .../upgrade/HostVersionOutOfSyncListenerTest.java | 14 +++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c3c4cada/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java index 7874461..d5a1ac4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java @@ -48,6 +48,7 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.RepositoryVersionState; +import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.StackId; import org.slf4j.Logger; @@ -115,6 +116,10 @@ public class HostVersionOutOfSyncListener { List hostVersionEntities = hostVersionDAO.get().findByClusterAndHost(cluster.getClusterName(), event.getHostName()); + Service service = cluster.getService(event.getServiceName()); + ServiceComponent serviceComponent = service.getServiceComponent(event.getComponentName()); + RepositoryVersionEntity componentRepo = serviceComponent.getDesiredRepositoryVersion(); + for (HostVersionEntity hostVersionEntity : hostVersionEntities) { StackEntity hostStackEntity = hostVersionEntity.getRepositoryVersion().getStack(); StackId hostStackId = new StackId(hostStackEntity); @@ -136,6 +141,12 @@ public class HostVersionOutOfSyncListener { continue; } + // !!! we shouldn't be changing other versions to OUT_OF_SYNC if the event + // component repository doesn't match + if (!hostVersionEntity.getRepositoryVersion().equals(componentRepo)) { + continue; + } + switch (hostVersionEntity.getState()) { case INSTALLED: case NOT_REQUIRED: http://git-wip-us.apache.org/repos/asf/ambari/blob/c3c4cada/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java index 076190a..24d4f55 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.events.listeners.upgrade; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.SQLException; import java.util.ArrayList; @@ -335,12 +336,12 @@ public class HostVersionOutOfSyncListenerTest { for (HostVersionEntity hostVersionEntity : hostVersions) { RepositoryVersionEntity repoVersion = hostVersionEntity.getRepositoryVersion(); - if (repoVersion.getVersion().equals(INSTALLED_VERSION) || repoVersion.getVersion().equals(INSTALLED_VERSION_2)) { - if (changedHosts.contains(hostVersionEntity.getHostName())) { - assertEquals(hostVersionEntity.getState(), RepositoryVersionState.OUT_OF_SYNC); - } else { - assertEquals(hostVersionEntity.getState(), RepositoryVersionState.INSTALLED); - } + + if (repoVersion.getVersion().equals(INSTALLED_VERSION_2)) { + assertEquals(RepositoryVersionState.INSTALLED, hostVersionEntity.getState()); + } else if (repoVersion.getVersion().equals(INSTALLED_VERSION)) { + assertTrue(changedHosts.contains(hostVersionEntity.getHostName())); + assertEquals(RepositoryVersionState.OUT_OF_SYNC, hostVersionEntity.getState()); } } } @@ -598,6 +599,5 @@ public class HostVersionOutOfSyncListenerTest { } } } - } }