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 9710a8d52f9 YARN-11701. [Federation] Enhance Federation Cache Clean
Conditions. (#6889) Contributed by Shilun Fan.
9710a8d52f9 is described below
commit 9710a8d52f9449ac8f74ef82f512f12018503c19
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Wed Jun 19 08:34:19 2024 +0800
YARN-11701. [Federation] Enhance Federation Cache Clean Conditions. (#6889)
Contributed by Shilun Fan.
Reviewed-by: Ayush Saxena <ayushsax...@apache.org>
---
.../hadoop/yarn/server/federation/cache/FederationCaffeineCache.java | 4 +++-
.../hadoop/yarn/server/federation/cache/FederationGuavaCache.java | 4 +++-
.../apache/hadoop/yarn/server/federation/cache/FederationJCache.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
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/FederationCaffeineCache.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
index cbf3e9db3db..96a630bae38 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationCaffeineCache.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
@@ -79,7 +79,9 @@ public class FederationCaffeineCache extends FederationCache {
@Override
public void clearCache() {
- this.cache.cleanUp();
+ if (this.cache != null) {
+ this.cache.cleanUp();
+ }
this.cache = null;
}
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/FederationGuavaCache.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationGuavaCache.java
index 2ba9e2869fe..01f38343fba 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationGuavaCache.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/cache/FederationGuavaCache.java
@@ -76,7 +76,9 @@ public class FederationGuavaCache extends FederationCache {
@Override
public void clearCache() {
- cache.invalidateAll();
+ if (this.cache != null) {
+ cache.invalidateAll();
+ }
cache = null;
}
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/FederationJCache.java
index 07f300e65f6..b31a24d2dda 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/FederationJCache.java
@@ -91,7 +91,9 @@ public class FederationJCache extends FederationCache {
@Override
public void clearCache() {
- this.cache.clear();
+ if (this.cache != null) {
+ this.cache.clear();
+ }
this.cache = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
