You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2020/09/15 11:53:30 UTC
[ambari] branch branch-2.7 updated: AMBARI-25550. Add viewFS
protocol to DFS_PROTOCOLS_REGEX (dlysnichenko) (#3226)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 7ead925 AMBARI-25550. Add viewFS protocol to DFS_PROTOCOLS_REGEX (dlysnichenko) (#3226)
7ead925 is described below
commit 7ead9258e0b7dfe69f8ac862405aa85ad8aa162d
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
AuthorDate: Tue Sep 15 14:52:31 2020 +0300
AMBARI-25550. Add viewFS protocol to DFS_PROTOCOLS_REGEX (dlysnichenko) (#3226)
---
.../checks/ServicesMapReduceDistributedCacheCheck.java | 2 +-
.../checks/ServicesTezDistributedCacheCheck.java | 2 +-
.../ServicesMapReduceDistributedCacheCheckTest.java | 18 ++++++++++++++++++
.../checks/ServicesTezDistributedCacheCheckTest.java | 18 ++++++++++++++++++
4 files changed, 38 insertions(+), 2 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 24f72a6..d8344b7 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|abfs):.*";
+ static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs|abfs|viewfs):.*";
/**
* {@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 32d12bd..3da9e3e 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|abfs):.*";
+ static final String DFS_PROTOCOLS_REGEX_DEFAULT = "^([^:]*dfs|wasb|ecs|abfs|viewfs):.*";
/**
* {@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 b67d837..f48a1bf 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
@@ -238,6 +238,15 @@ public class ServicesMapReduceDistributedCacheCheckTest {
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
properties.put("fs.defaultFS", "anything");
+ properties.put("mapreduce.application.framework.path", "viewfs://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");
@@ -282,6 +291,15 @@ public class ServicesMapReduceDistributedCacheCheckTest {
servicesMapReduceDistributedCacheCheck.perform(check, request);
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+ properties.put("fs.defaultFS", "viewfs://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 d9d9e20..5bd3f66 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
@@ -247,6 +247,15 @@ public class ServicesTezDistributedCacheCheckTest {
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
properties.put("fs.defaultFS", "anything");
+ properties.put("tez.lib.uris", "viewfs://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", "abfs://some/path/to/archive.tar.gz");
properties.put("tez.use.cluster.hadoop-libs", "false");
request = new PrereqCheckRequest("cluster");
@@ -291,6 +300,15 @@ public class ServicesTezDistributedCacheCheckTest {
servicesTezDistributedCacheCheck.perform(check, request);
Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+ properties.put("fs.defaultFS", "viewfs://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", "abfs://ha");
properties.put("tez.lib.uris", "/some/path/to/archive.tar.gz");
properties.put("tez.use.cluster.hadoop-libs", "false");