This is an automated email from the ASF dual-hosted git repository. mpapirkovskyy pushed a commit to branch branch-2.6 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push: new 87ffa12 AMBARI-25236. Host Ordered Upgrade: Pre Upgrade check of fs.defaultFS fails for ABFS. (mpapirkovskyy) (#2923) 87ffa12 is described below commit 87ffa123d5181fdccb48b6912d07162d9a01d5fb Author: Myroslav Papirkovskyi <mpapirkovs...@apache.org> AuthorDate: Tue Apr 9 21:37:20 2019 +0300 AMBARI-25236. Host Ordered Upgrade: Pre Upgrade check of fs.defaultFS fails for ABFS. (mpapirkovskyy) (#2923) --- .../ServicesMapReduceDistributedCacheCheck.java | 2 +- .../checks/ServicesTezDistributedCacheCheck.java | 2 +- .../ServicesMapReduceDistributedCacheCheckTest.java | 20 +++++++++++++++++++- .../checks/ServicesTezDistributedCacheCheckTest.java | 20 +++++++++++++++++++- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java index ab7e798..cd3a2de 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java @@ -47,7 +47,7 @@ public class ServicesMapReduceDistributedCacheCheck extends AbstractCheckDescrip static final String KEY_FRAMEWORK_PATH = "framework_path"; static final String KEY_NOT_DFS = "not_dfs"; static final String DFS_PROTOCOLS_REGEX_PROPERTY_NAME = "dfs-protocols-regex"; - static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs):.*"; + static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs|abfs):.*"; /** * {@inheritDoc} diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java index cb0c9ae..5f72c55 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java @@ -49,7 +49,7 @@ public class ServicesTezDistributedCacheCheck extends AbstractCheckDescriptor { static final String KEY_LIB_NOT_TARGZ = "lib_not_targz"; static final String KEY_USE_HADOOP_LIBS_FALSE = "tez_use_hadoop_libs_false"; static final String DFS_PROTOCOLS_REGEX_PROPERTY_NAME = "dfs-protocols-regex"; - static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs):.*"; + static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs|abfs):.*"; /** * {@inheritDoc} diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java index b32a782..b67d837 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java @@ -190,7 +190,7 @@ public class ServicesMapReduceDistributedCacheCheckTest { Mockito.when(config.getProperties()).thenReturn(properties); Map<String, String> checkProperties = new HashMap<>(); - checkProperties.put("dfs-protocols-regex","^([^:]*dfs|wasb|ecs):.*"); + checkProperties.put("dfs-protocols-regex",ServicesMapReduceDistributedCacheCheck.DFS_PROTOCOLS_REGEX_DEFAULT); PrerequisiteCheckConfig prerequisiteCheckConfig = Mockito.mock(PrerequisiteCheckConfig.class); Mockito.when(prerequisiteCheckConfig.getCheckProperties( servicesMapReduceDistributedCacheCheck.getClass().getName())).thenReturn(checkProperties); @@ -229,6 +229,15 @@ public class ServicesMapReduceDistributedCacheCheckTest { Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); properties.put("fs.defaultFS", "anything"); + properties.put("mapreduce.application.framework.path", "abfs://some/path"); + properties.put("mapreduce.application.classpath", "anything"); + request = new PrereqCheckRequest("cluster"); + request.setPrerequisiteCheckConfig(prerequisiteCheckConfig); + check = new PrerequisiteCheck(null, null); + servicesMapReduceDistributedCacheCheck.perform(check, request); + Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + + properties.put("fs.defaultFS", "anything"); properties.put("mapreduce.application.framework.path", "ecs://some/path"); properties.put("mapreduce.application.classpath", "anything"); request = new PrereqCheckRequest("cluster"); @@ -264,6 +273,15 @@ public class ServicesMapReduceDistributedCacheCheckTest { servicesMapReduceDistributedCacheCheck.perform(check, request); Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + properties.put("fs.defaultFS", "abfs://ha"); + properties.put("mapreduce.application.framework.path", "/some/path"); + properties.put("mapreduce.application.classpath", "anything"); + request = new PrereqCheckRequest("cluster"); + request.setPrerequisiteCheckConfig(prerequisiteCheckConfig); + check = new PrerequisiteCheck(null, null); + servicesMapReduceDistributedCacheCheck.perform(check, request); + Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + properties.put("fs.defaultFS", "ecs://ha"); properties.put("mapreduce.application.framework.path", "/some/path"); properties.put("mapreduce.application.classpath", "anything"); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java index 0123f18..d9d9e20 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java @@ -207,7 +207,7 @@ public class ServicesTezDistributedCacheCheckTest { Mockito.when(config.getProperties()).thenReturn(properties); Map<String, String> checkProperties = new HashMap<>(); - checkProperties.put("dfs-protocols-regex","^([^:]*dfs|wasb|ecs):.*"); + checkProperties.put("dfs-protocols-regex", ServicesTezDistributedCacheCheck.DFS_PROTOCOLS_REGEX_DEFAULT); PrerequisiteCheckConfig prerequisiteCheckConfig = Mockito.mock(PrerequisiteCheckConfig.class); Mockito.when(prerequisiteCheckConfig.getCheckProperties( servicesTezDistributedCacheCheck.getClass().getName())).thenReturn(checkProperties); @@ -247,6 +247,15 @@ public class ServicesTezDistributedCacheCheckTest { Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); properties.put("fs.defaultFS", "anything"); + properties.put("tez.lib.uris", "abfs://some/path/to/archive.tar.gz"); + properties.put("tez.use.cluster.hadoop-libs", "false"); + request = new PrereqCheckRequest("cluster"); + request.setPrerequisiteCheckConfig(prerequisiteCheckConfig); + check = new PrerequisiteCheck(null, null); + servicesTezDistributedCacheCheck.perform(check, request); + Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + + properties.put("fs.defaultFS", "anything"); properties.put("tez.lib.uris", "ecs://some/path/to/archive.tar.gz"); properties.put("tez.use.cluster.hadoop-libs", "false"); request = new PrereqCheckRequest("cluster"); @@ -282,6 +291,15 @@ public class ServicesTezDistributedCacheCheckTest { servicesTezDistributedCacheCheck.perform(check, request); Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + properties.put("fs.defaultFS", "abfs://ha"); + properties.put("tez.lib.uris", "/some/path/to/archive.tar.gz"); + properties.put("tez.use.cluster.hadoop-libs", "false"); + request = new PrereqCheckRequest("cluster"); + request.setPrerequisiteCheckConfig(prerequisiteCheckConfig); + check = new PrerequisiteCheck(null, null); + servicesTezDistributedCacheCheck.perform(check, request); + Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); + properties.put("fs.defaultFS", "ecs://ha"); properties.put("tez.lib.uris", "/some/path/to/archive.tar.gz"); properties.put("tez.use.cluster.hadoop-libs", "false");