From 96344561e81a282bd32f52cce94e019ef153b1d6 Mon Sep 17 00:00:00 2001
From: jiaoqingbo <1178404354@qq.com>
Date: Sun, 25 Feb 2024 22:20:41 +0800
Subject: [PATCH] [CELEBRON-1285] Add check tenantConfig.getConfigs().isEmpty()
 in getTenantUserConfigFromCache

### What changes were proposed in this pull request?

 Add check tenantConfig.getConfigs().isEmpty() in getTenantUserConfigFromCache

### Why are the changes needed?

 Add check tenantConfig.getConfigs().isEmpty() in getTenantUserConfigFromCache

### Does this PR introduce _any_ user-facing change?

NO

### How was this patch tested?

PASS GA

Closes #2324 from jiaoqingbo/1285.

Authored-by: jiaoqingbo <1178404354@qq.com>
Signed-off-by: waitinfuture <zky.zhoukeyong@alibaba-inc.com>
---
 .../celeborn/server/common/service/config/ConfigService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java b/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
index 9dfe14e29..1d8531654 100644
--- a/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
+++ b/service/src/main/java/org/apache/celeborn/server/common/service/config/ConfigService.java
@@ -94,7 +94,7 @@ public interface ConfigService {
    */
   default DynamicConfig getTenantUserConfigFromCache(String tenantId, String userId) {
     TenantConfig tenantConfig = getRawTenantUserConfigFromCache(tenantId, userId);
-    if (tenantConfig == null) {
+    if (tenantConfig == null || tenantConfig.getConfigs().isEmpty()) {
       return getTenantConfigFromCache(tenantId);
     } else {
       return tenantConfig;