Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-22457 aea1a3c48 -> c0fbb86a4 refs/heads/trunk b1acd1dfe -> cadbf3542
AMBARI-22500. Modify AMBARI-22387 to Check for LZO + No Opt-in (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0fbb86a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0fbb86a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0fbb86a Branch: refs/heads/branch-feature-AMBARI-22457 Commit: c0fbb86a4c34190be01ff287586959b5320ea98d Parents: aea1a3c Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Wed Nov 22 17:44:07 2017 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Wed Nov 22 17:44:07 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/checks/LZOCheck.java | 6 +++++- .../org/apache/ambari/server/checks/LZOCheckTest.java | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c0fbb86a/ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java index 9c0286b..1eaacea 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java @@ -52,6 +52,9 @@ public class LZOCheck extends AbstractCheckDescriptor { */ @Override public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest request) throws AmbariException { + if (config.getGplLicenseAccepted()){ + return; + } List<String> errorMessages = new ArrayList<>(); PrereqCheckStatus checkStatus = PrereqCheckStatus.WARNING; @@ -66,7 +69,8 @@ public class LZOCheck extends AbstractCheckDescriptor { } if (!errorMessages.isEmpty()) { - prerequisiteCheck.setFailReason(StringUtils.join(errorMessages, "You have LZO codec enabled in the core-site config of your cluster. LZO is no longer installed automatically. " + + prerequisiteCheck.setFailReason(StringUtils.join(errorMessages, "You have LZO codec enabled in the core-site config of your cluster. " + + "You have to accept GPL license during ambari-server setup to have LZO installed automatically. " + "If any hosts require LZO, it should be installed before starting the upgrade. " + "Consult Ambari documentation for instructions on how to do this.")); prerequisiteCheck.getFailedOn().add("LZO"); http://git-wip-us.apache.org/repos/asf/ambari/blob/c0fbb86a/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java index e50e936..13f52a5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java @@ -60,6 +60,9 @@ public class LZOCheckTest { @Mock private RepositoryVersionEntity m_repositoryVersion; + @Mock + private Configuration configuration; + final Map<String, Service> m_services = new HashMap<>(); @Before @@ -70,8 +73,7 @@ public class LZOCheckTest { return clusters; } }; - Configuration config = Mockito.mock(Configuration.class); - lZOCheck.config = config; + lZOCheck.config = configuration; m_services.clear(); @@ -99,7 +101,6 @@ public class LZOCheckTest { public void testPerform() throws Exception { final Cluster cluster = Mockito.mock(Cluster.class); final Map<String, Service> services = new HashMap<>(); - final Service service = Mockito.mock(Service.class); Mockito.when(cluster.getServices()).thenReturn(services); Mockito.when(cluster.getClusterId()).thenReturn(1L); @@ -115,6 +116,7 @@ public class LZOCheckTest { Mockito.when(cluster.getConfig(Mockito.anyString(), Mockito.anyString())).thenReturn(config); final Map<String, String> properties = new HashMap<>(); Mockito.when(config.getProperties()).thenReturn(properties); + Mockito.when(configuration.getGplLicenseAccepted()).thenReturn(false); PrerequisiteCheck check = new PrerequisiteCheck(null, null); lZOCheck.perform(check, new PrereqCheckRequest("cluster")); @@ -141,5 +143,10 @@ public class LZOCheckTest { check = new PrerequisiteCheck(null, null); lZOCheck.perform(check, new PrereqCheckRequest("cluster")); Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus()); + + Mockito.when(configuration.getGplLicenseAccepted()).thenReturn(true); + check = new PrerequisiteCheck(null, null); + lZOCheck.perform(check, new PrereqCheckRequest("cluster")); + Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); } }