[type:fix] e2e test error

moremind · Oct 21, 2023 · 48db706 · 48db706
1 parent 51eda75
commit 48db706
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java b/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java
@@ -359,11 +359,11 @@ class LongPollingClient implements Runnable {
         @Override
         public void run() {
             try {
-                this.asyncTimeoutFuture = scheduler.schedule(() -> {
+                this.asyncTimeoutFuture = scheduler.scheduleWithFixedDelay(() -> {
                     clients.remove(LongPollingClient.this);
                     List<ConfigGroupEnum> changedGroups = compareChangedGroup((HttpServletRequest) asyncContext.getRequest());
                     sendResponse(changedGroups);
-                }, timeoutTime, TimeUnit.MILLISECONDS);
+                }, 0, timeoutTime, TimeUnit.MILLISECONDS);
                 clients.add(this);
             } catch (Exception ex) {
                 log.error("add long polling client error", ex);

diff --git a/...yu-sync-data-http/src/main/java/org/apache/shenyu/sync/data/http/HttpSyncDataService.java b/...yu-sync-data-http/src/main/java/org/apache/shenyu/sync/data/http/HttpSyncDataService.java
@@ -129,7 +129,7 @@ private void fetchGroupConfig(final ConfigGroupEnum... groups) throws ShenyuExce
         }
     }
 
-    private void doFetchGroupConfig(final String server, final ConfigGroupEnum... groups) {
+    private synchronized void doFetchGroupConfig(final String server, final ConfigGroupEnum... groups) {
         StringBuilder params = new StringBuilder();
         for (ConfigGroupEnum groupKey : groups) {
             params.append("groupKeys").append("=").append(groupKey.name()).append("&");
@@ -155,7 +155,7 @@ private void doFetchGroupConfig(final String server, final ConfigGroupEnum... gr
         }
         // not updated. it is likely that the current config server has not been updated yet. wait a moment.
         LOG.info("The config of the server[{}] has not been updated or is out of date. Wait for listening for changes again.", server);
-        ThreadUtils.sleep(TimeUnit.SECONDS, 3);
+        ThreadUtils.sleep(TimeUnit.SECONDS, 30);
     }
 
 
@@ -180,6 +180,7 @@ private void doLongPolling(final String server) {
                 params.put(group.name(), Lists.newArrayList(value));
             }
         }
+        LOG.debug("listener params: [{}]", params);
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         headers.set(Constants.X_ACCESS_TOKEN, this.accessTokenManager.getAccessToken());