[1/2] hadoop git commit: Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru)."

2018-03-28 Thread subru 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 a998f22f5 -> cb3e5147a


Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade 
cache when failing over. (Botong Huang via Subru)."

This reverts commit 8d51daaaf5b86f0f4cb4c1af47a39fb6308053cd.


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

Branch: refs/heads/branch-2.9
Commit: ad7d7935c4b42c23171a476aa62a27d05ee11a0b
Parents: a998f22
Author: Subru Krishnan 
Authored: Wed Mar 28 11:55:04 2018 -0700
Committer: Subru Krishnan 
Committed: Wed Mar 28 11:55:04 2018 -0700

--
 .../org/apache/hadoop/yarn/conf/YarnConfiguration.java   |  9 +++--
 .../src/main/resources/yarn-default.xml  |  9 -
 .../failover/FederationRMFailoverProxyProvider.java  | 11 +++
 3 files changed, 6 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad7d7935/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 6cfb2a9..edeec9f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -2792,18 +2792,15 @@ public class YarnConfiguration extends Configuration {
 
   public static final String FEDERATION_CACHE_TIME_TO_LIVE_SECS =
   FEDERATION_PREFIX + "cache-ttl.secs";
-  // 5 minutes
-  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
-
-  public static final String FEDERATION_FLUSh_CACHE_FOR_RM_ADDR =
-  FEDERATION_PREFIX + "flush-cache-for-rm-addr";
-  public static final boolean DEFAULT_FEDERATION_FLUSh_CACHE_FOR_RM_ADDR = 
true;
 
   public static final String FEDERATION_REGISTRY_BASE_KEY =
   FEDERATION_PREFIX + "registry.base-dir";
   public static final String DEFAULT_FEDERATION_REGISTRY_BASE_KEY =
   "yarnfederation/";
 
+  // 5 minutes
+  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
+
   public static final String FEDERATION_STATESTORE_HEARTBEAT_INTERVAL_SECS =
   FEDERATION_PREFIX + "state-store.heartbeat-interval-secs";
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad7d7935/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 800e56f..ce8c0f1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -2816,15 +2816,6 @@
   
 
   
-   
-Whether to flush FederationStateStoreFacade cache to get subcluster info
-when FederationRMFailoverProxyProvider is performing failover.
-   
-   yarn.federation.flush-cache-for-rm-addr
-   true
-  
-
-  
 The registry base directory for federation.
 yarn.federation.registry.base-dir
 yarnfederation/

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad7d7935/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
index b72b199..c631208 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
@@ -64,8 +64,7 @

[1/2] hadoop git commit: Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru)."

2018-03-28 Thread subru 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 a2b4daab5 -> a0091ec4b


Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade 
cache when failing over. (Botong Huang via Subru)."

This reverts commit 85eebf1bebc7b191dcd692395f77903257cd85c4.


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

Branch: refs/heads/branch-3.1
Commit: ed49f59e1896a81c9ab4e3a744413f9f1bb37da0
Parents: a2b4daa
Author: Subru Krishnan 
Authored: Wed Mar 28 11:35:30 2018 -0700
Committer: Subru Krishnan 
Committed: Wed Mar 28 11:35:30 2018 -0700

--
 .../org/apache/hadoop/yarn/conf/YarnConfiguration.java   |  9 +++--
 .../src/main/resources/yarn-default.xml  |  9 -
 .../failover/FederationRMFailoverProxyProvider.java  | 11 +++
 3 files changed, 6 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed49f59e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 6390afc..b76f457 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -3087,18 +3087,15 @@ public class YarnConfiguration extends Configuration {
 
   public static final String FEDERATION_CACHE_TIME_TO_LIVE_SECS =
   FEDERATION_PREFIX + "cache-ttl.secs";
-  // 5 minutes
-  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
-
-  public static final String FEDERATION_FLUSh_CACHE_FOR_RM_ADDR =
-  FEDERATION_PREFIX + "flush-cache-for-rm-addr";
-  public static final boolean DEFAULT_FEDERATION_FLUSh_CACHE_FOR_RM_ADDR = 
true;
 
   public static final String FEDERATION_REGISTRY_BASE_KEY =
   FEDERATION_PREFIX + "registry.base-dir";
   public static final String DEFAULT_FEDERATION_REGISTRY_BASE_KEY =
   "yarnfederation/";
 
+  // 5 minutes
+  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
+
   public static final String FEDERATION_STATESTORE_HEARTBEAT_INTERVAL_SECS =
   FEDERATION_PREFIX + "state-store.heartbeat-interval-secs";
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed49f59e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 2eba8df..114ba4b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -2925,15 +2925,6 @@
   
 
   
-   
-Whether to flush FederationStateStoreFacade cache to get subcluster info
-when FederationRMFailoverProxyProvider is performing failover.
-   
-   yarn.federation.flush-cache-for-rm-addr
-   true
-  
-
-  
 The registry base directory for federation.
 yarn.federation.registry.base-dir
 yarnfederation/

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed49f59e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
index b72b199..c631208 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
@@ -64,8 +64,7 @

[1/2] hadoop git commit: Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru)."

2018-03-28 Thread subru 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 47f711eeb -> 0d7e0


Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade 
cache when failing over. (Botong Huang via Subru)."

This reverts commit 2a2ef15caf791f30c471526c1b74e68803f0c405 as 
smart-apply-patch script didn't pick the latest patch.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/725b10e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/725b10e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/725b10e3

Branch: refs/heads/trunk
Commit: 725b10e3aee383d049c97f8ed2b0b1ae873d5ae8
Parents: 47f711e
Author: Subru Krishnan 
Authored: Wed Mar 28 11:26:50 2018 -0700
Committer: Subru Krishnan 
Committed: Wed Mar 28 11:26:50 2018 -0700

--
 .../org/apache/hadoop/yarn/conf/YarnConfiguration.java   |  9 +++--
 .../src/main/resources/yarn-default.xml  |  9 -
 .../failover/FederationRMFailoverProxyProvider.java  | 11 +++
 3 files changed, 6 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/725b10e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 658099a..04b2898 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -3089,18 +3089,15 @@ public class YarnConfiguration extends Configuration {
 
   public static final String FEDERATION_CACHE_TIME_TO_LIVE_SECS =
   FEDERATION_PREFIX + "cache-ttl.secs";
-  // 5 minutes
-  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
-
-  public static final String FEDERATION_FLUSh_CACHE_FOR_RM_ADDR =
-  FEDERATION_PREFIX + "flush-cache-for-rm-addr";
-  public static final boolean DEFAULT_FEDERATION_FLUSh_CACHE_FOR_RM_ADDR = 
true;
 
   public static final String FEDERATION_REGISTRY_BASE_KEY =
   FEDERATION_PREFIX + "registry.base-dir";
   public static final String DEFAULT_FEDERATION_REGISTRY_BASE_KEY =
   "yarnfederation/";
 
+  // 5 minutes
+  public static final int DEFAULT_FEDERATION_CACHE_TIME_TO_LIVE_SECS = 5 * 60;
+
   public static final String FEDERATION_STATESTORE_HEARTBEAT_INTERVAL_SECS =
   FEDERATION_PREFIX + "state-store.heartbeat-interval-secs";
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/725b10e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 2eba8df..114ba4b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -2925,15 +2925,6 @@
   
 
   
-   
-Whether to flush FederationStateStoreFacade cache to get subcluster info
-when FederationRMFailoverProxyProvider is performing failover.
-   
-   yarn.federation.flush-cache-for-rm-addr
-   true
-  
-
-  
 The registry base directory for federation.
 yarn.federation.registry.base-dir
 yarnfederation/

http://git-wip-us.apache.org/repos/asf/hadoop/blob/725b10e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
index b72b199..c631208 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/FederationRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/failover/Federat