From bbb2f908b6f573cf045060647e76cf20338bf6f4 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 19 May 2026 17:13:25 +0800 Subject: [PATCH 1/2] [#5141] fixed latest instance information cannot be obtained when cache instances is empty problem. --- .../service/center/client/ServiceCenterDiscovery.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java index 2598b52c24..a46e3a5719 100644 --- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java +++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java @@ -17,6 +17,7 @@ package org.apache.servicecomb.service.center.client; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -296,9 +297,15 @@ public void execute() { } private synchronized void pullAllInstance() { + List emptyInstancesCache = new ArrayList<>(); instancesCache.forEach((k, v) -> { pullInstance(k, v, true); + if (v.instancesCache.isEmpty()) { + emptyInstancesCache.add(k); + } }); + emptyInstancesCache.forEach(instancesCache::remove); + emptyInstancesCache.clear(); } private static String instanceToString(List instances) { From 1b2eb006f005ee07b79c60ec00d416c21ae4c459 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 19 May 2026 19:37:00 +0800 Subject: [PATCH 2/2] [#5141] update os version --- .github/workflows/checkstyle.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/rat_check.yml | 2 +- .github/workflows/spotbugs.yml | 2 +- .github/workflows/unit-test-jdk11.yml | 2 +- .github/workflows/unit-test-jdk17.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index dab1228a69..633179a601 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -26,7 +26,7 @@ on: jobs: checkstyle: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Set up jdk diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6037e44da1..4e070fa9a1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: build: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/rat_check.yml b/.github/workflows/rat_check.yml index 0148c9020e..0178e20cc4 100644 --- a/.github/workflows/rat_check.yml +++ b/.github/workflows/rat_check.yml @@ -29,7 +29,7 @@ on: jobs: rat_check: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Set up jdk diff --git a/.github/workflows/spotbugs.yml b/.github/workflows/spotbugs.yml index dddae01a95..c4b32db173 100644 --- a/.github/workflows/spotbugs.yml +++ b/.github/workflows/spotbugs.yml @@ -26,7 +26,7 @@ on: jobs: spotbugs: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Set up jdk diff --git a/.github/workflows/unit-test-jdk11.yml b/.github/workflows/unit-test-jdk11.yml index df2c21db11..648edc4975 100644 --- a/.github/workflows/unit-test-jdk11.yml +++ b/.github/workflows/unit-test-jdk11.yml @@ -27,7 +27,7 @@ on: jobs: unit-tests: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Set up jdk diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml index 2604cd9c03..2ab71a35ec 100644 --- a/.github/workflows/unit-test-jdk17.yml +++ b/.github/workflows/unit-test-jdk17.yml @@ -27,7 +27,7 @@ on: jobs: unit-tests: timeout-minutes: 60 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Set up jdk