ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: Revert "AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic Enabled For Rolling Upgrade (jonathanhurley)"
Date Tue, 07 Jul 2015 17:58:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 d3ffba5ad -> 3ac55e026


Revert "AMBARI-11192 - The Default hdfs-site.xml Should Have Client Retry Logic Enabled For
Rolling Upgrade (jonathanhurley)"


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ac55e02
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ac55e02
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ac55e02

Branch: refs/heads/branch-2.1
Commit: 3ac55e02626db3e1533ea62718e72d193e0a4b00
Parents: d3ffba5
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Tue Jul 7 10:58:16 2015 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Tue Jul 7 10:58:18 2015 -0700

----------------------------------------------------------------------
 .../apache/ambari/server/checks/CheckDescription.java   |  2 --
 .../ambari/server/checks/ClientRetryPropertyCheck.java  | 10 ++--------
 .../HDP/2.2/services/HDFS/configuration/hdfs-site.xml   |  2 +-
 .../server/checks/ClientRetryPropertyCheckTest.java     | 12 ------------
 4 files changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac55e02/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 5e029f4..0cd5352 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -31,8 +31,6 @@ public enum CheckDescription {
   CLIENT_RETRY(PrereqCheckType.SERVICE,
       "Client Retry Properties",
       new HashMap<String, String>() {{
-        put(ClientRetryPropertyCheck.HDFS_CLIENT_RETRY_MISSING_KEY,
-          "The hdfs-site.xml property dfs.client.retry.policy.enabled should be set to true.");
         put(ClientRetryPropertyCheck.HIVE_CLIENT_RETRY_MISSING_KEY,
           "The hive-site.xml property hive.metastore.failure.retries should be set to a positive
value.");
         put(ClientRetryPropertyCheck.OOZIE_CLIENT_RETRY_MISSING_KEY,

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac55e02/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
index 4beba33..52fca40 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
@@ -39,7 +39,6 @@ import com.google.inject.Singleton;
 @UpgradeCheck(group = UpgradeCheckGroup.CLIENT_RETRY_PROPERTY)
 public class ClientRetryPropertyCheck extends AbstractCheckDescriptor {
 
-  static final String HDFS_CLIENT_RETRY_MISSING_KEY = "hdfs.client.retry.missing.key";
   static final String HIVE_CLIENT_RETRY_MISSING_KEY = "hive.client.retry.missing.key";
   static final String OOZIE_CLIENT_RETRY_MISSING_KEY = "oozie.client.retry.missing.key";
 
@@ -80,14 +79,9 @@ public class ClientRetryPropertyCheck extends AbstractCheckDescriptor {
 
     List<String> errorMessages = new ArrayList<String>();
 
+    // We excluded hdfs-site property dfs.client.retry.policy.enabled because default is
false, and should remain
+    // that way due to *****.
     // check hdfs client property
-    if (services.containsKey("HDFS")) {
-      String hdfsClientRetry = getProperty(request, "hdfs-site", "dfs.client.retry.policy.enabled");
-      if (null == hdfsClientRetry || !Boolean.parseBoolean(hdfsClientRetry)) {
-        errorMessages.add(getFailReason(HDFS_CLIENT_RETRY_MISSING_KEY, prerequisiteCheck,
request));
-        prerequisiteCheck.getFailedOn().add("HDFS");
-      }
-    }
 
     // check hive client properties
     if (services.containsKey("HIVE")) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac55e02/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
index e42b3f8..0c06301 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
@@ -36,7 +36,7 @@
   
   <property>
     <name>dfs.client.retry.policy.enabled</name>
-    <value>true</value>
+    <value>false</value>
     <description>Enables HDFS client retry in the event of a NameNode failure.</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac55e02/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
index d3fd187..23926f8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
@@ -113,18 +113,6 @@ public class ClientRetryPropertyCheckTest {
     m_check.perform(check, new PrereqCheckRequest("cluster"));
     Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus());
 
-    // hdfs retry false
-    properties.put("dfs.client.retry.policy.enabled", "false");
-    check = new PrerequisiteCheck(null, null);
-    m_check.perform(check, new PrereqCheckRequest("cluster"));
-    Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus());
-
-    // hdfs retry true
-    properties.put("dfs.client.retry.policy.enabled", "true");
-    check = new PrerequisiteCheck(null, null);
-    m_check.perform(check, new PrereqCheckRequest("cluster"));
-    Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
-
     // add hive
     services.put("HIVE", Mockito.mock(Service.class));
 


Mime
View raw message