(hadoop) branch trunk updated (9f6c997662c5 -> 167d4c8447f9)

2024-05-31 Thread slfan1989 
This is an automated email from the ASF dual-hosted git repository.

slfan1989 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


from 9f6c997662c5 YARN-11471. [Federation] FederationStateStoreFacade Cache 
Support Caffeine. (#6795) Contributed by Shilun Fan.
 add 167d4c8447f9 YARN-11699. Diagnostics lacks userlimit info when user 
capacity has reached its maximum limit (#6849) Contributed by Jiandan Yang.

No new revisions were added by this update.

Summary of changes:
 .../resourcemanager/scheduler/capacity/AbstractLeafQueue.java | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

(hadoop) branch trunk updated: YARN-11471. [Federation] FederationStateStoreFacade Cache Support Caffeine. (#6795) Contributed by Shilun Fan.

2024-05-31 Thread slfan1989 
This is an automated email from the ASF dual-hosted git repository.

slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 9f6c997662c5 YARN-11471. [Federation] FederationStateStoreFacade Cache 
Support Caffeine. (#6795) Contributed by Shilun Fan.
9f6c997662c5 is described below

commit 9f6c997662c5212bd7b542c1e5188ad4ede3f840
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Sat Jun 1 06:15:20 2024 +0800

YARN-11471. [Federation] FederationStateStoreFacade Cache Support Caffeine. 
(#6795) Contributed by Shilun Fan.

Reviewed-by: Inigo Goiri 
Signed-off-by: Shilun Fan 
---
 LICENSE-binary |  1 +
 hadoop-project/pom.xml |  6 ++
 .../hadoop-yarn-server-common/pom.xml  | 14 
 ...ionJCache.java => FederationCaffeineCache.java} | 86 --
 .../server/federation/cache/FederationJCache.java  |  2 +-
 .../federation/cache/TestFederationCache.java  |  3 +-
 .../pom.xml|  4 +
 .../src/site/markdown/Federation.md|  8 +-
 8 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index c0258e9311b1..32f9f06ae15d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -226,6 +226,7 @@ 
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
 com.fasterxml.uuid:java-uuid-generator:3.1.4
 com.fasterxml.woodstox:woodstox-core:5.4.0
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.davidmoten:rxjava-extras:0.8.0.17
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google:guice:4.0
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ba7631189a1a..0345925e9994 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -134,6 +134,7 @@
 2.0.3
 3.8.2
 1.1.1
+2.9.3
 4.0.3
 10.14.2.0
 6.2.1.jre7
@@ -1975,6 +1976,11 @@
 
   
 
+
+  com.github.ben-manes.caffeine
+  caffeine
+  ${caffeine.version}
+
 
   com.zaxxer
   HikariCP
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index 1f762d31800d..e768ad5e4845 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -131,6 +131,20 @@
   org.ehcache
   ehcache
 
+
+  com.github.ben-manes.caffeine
+  caffeine
+  
+
+  org.checkerframework
+  checker-qual
+
+
+  com.google.errorprone
+  error_prone_annotations
+
+  
+
 
   com.zaxxer
   HikariCP
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationJCache.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationCaffeineCache.java
similarity index 60%
copy from 
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationJCache.java
copy to 
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationCaffeineCache.java
index b4dbefe1278a..cbf3e9db3db3 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationJCache.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationCaffeineCache.java
@@ -14,10 +14,10 @@
  * License for the specific language governing permissions and limitations 
under
  * the License.
  */
-
 package org.apache.hadoop.yarn.server.federation.cache;
 
-import org.apache.hadoop.classification.VisibleForTesting;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -26,31 +26,28 @@ import 
org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
 import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
 import