You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2022/11/07 08:28:02 UTC
[GitHub] [dubbo] AlbumenJ commented on a diff in pull request #10885: Feature/modify xds subscribe
AlbumenJ commented on code in PR #10885:
URL: https://github.com/apache/dubbo/pull/10885#discussion_r1015125754
##########
dubbo-dependencies-bom/pom.xml:
##########
@@ -180,7 +180,7 @@
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<commons_compress_version>1.21</commons_compress_version>
- <revision>3.2.0-beta.1-SNAPSHOT</revision>
+ <revision>3.3</revision>
Review Comment:
Why change this line
##########
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/AbstractProtocol.java:
##########
@@ -139,48 +132,43 @@ public long observeResource(Set<String> resourceNames, Consumer<T> consumer) {
consumer.accept(getResource(resourceNames));
// channel reused
- StreamObserver<DiscoveryRequest> requestObserver = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(request));
+ StreamObserver<DiscoveryRequest> requestObserver = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(request, consumer));
requestObserverMap.put(request, requestObserver);
- ScheduledFuture<?> scheduledFuture = pollingExecutor.scheduleAtFixedRate(() -> {
- try {
- // origin request, may changed by updateObserve
- Set<String> names = requestParam.get(request);
-
- // use future to get async result, future complete on StreamObserver onNext
- CompletableFuture<T> future = new CompletableFuture<>();
- streamResult.put(request, future);
-
- // observer reused
- StreamObserver<DiscoveryRequest> observer = requestObserverMap.get(request);
-
- if (observer == null) {
- observer = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(request));
- requestObserverMap.put(request, observer);
- }
-
- // send request to control panel
- observer.onNext(buildDiscoveryRequest(names));
-
- try {
- // get result
- consumer.accept(future.get());
- } catch (InterruptedException | ExecutionException e) {
- logger.error("Error occur when request control panel.");
- } finally {
- // close observer
- //requestObserver.onCompleted();
-
- // remove temp
- streamResult.remove(request);
- }
- } catch (Throwable t) {
- logger.error("Error when requesting observe data. Type: " + getTypeUrl(), t);
- }
- }, pollingTimeout, pollingTimeout, TimeUnit.SECONDS);
+ try {
+ // origin request, may changed by updateObserve
+ Set<String> names = requestParam.get(request);
+
+ // use future to get async result, future complete on StreamObserver onNext
+ CompletableFuture<T> future = new CompletableFuture<>();
+ streamResult.put(request, future);
+
+ // observer reused
+ StreamObserver<DiscoveryRequest> observer = requestObserverMap.get(request);
- observeScheduledMap.put(request, scheduledFuture);
+ if (observer == null) {
+ observer = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(request, consumer));
+ requestObserverMap.put(request, observer);
+ }
+ // send request to control panel
+ observer.onNext(buildDiscoveryRequest(names));
+
+// try {
+// // get result
+// consumer.accept(future.get());
+// } catch (InterruptedException | ExecutionException e) {
+// logger.error("Error occur when request control panel.");
+// } finally {
+// // close observer
+// //requestObserver.onCompleted();
+//
+// // remove temp
+// streamResult.remove(request);
+// }
Review Comment:
remove unused code
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org