AMBARI-25236. Host Ordered Upgrade: Pre Upgrade check of fs.defaultFS…

… fails for ABFS. (mpapirkovskyy) (#2921)
apache · Apr 9, 2019 · 60dc4ff · 60dc4ff
2 parents a112364 + 63902d6
commit 60dc4ff
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/...src/main/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheck.java b/...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/...erver/src/main/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheck.java b/...erver/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/...test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java b/...test/java/org/apache/ambari/server/checks/ServicesMapReduceDistributedCacheCheckTest.java
@@ -190,7 +190,7 @@ public void testPerformWithCheckConfig() throws Exception {
     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);
@@ -228,6 +228,15 @@ public void testPerformWithCheckConfig() throws Exception {
     servicesMapReduceDistributedCacheCheck.perform(check, request);
     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");
@@ -264,6 +273,15 @@ public void testPerformWithCheckConfig() throws Exception {
     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/...r/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java b/...r/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
@@ -207,7 +207,7 @@ public void testPerformWithCheckConfig() throws Exception {
     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);
@@ -246,6 +246,15 @@ public void testPerformWithCheckConfig() throws Exception {
     servicesTezDistributedCacheCheck.perform(check, request);
     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");
@@ -282,6 +291,15 @@ public void testPerformWithCheckConfig() throws Exception {
     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");