feat: fix oom (#11571)

apache · Feb 15, 2023 · e78a0b0 · e78a0b0
1 parent 5a27cb5
commit e78a0b0
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java
@@ -86,8 +86,8 @@ public void destroy() {
 
     @Override
     public Result invoke(Invocation invocation) throws RpcException {
+        ProfilerEntry originEntry = null;
         try {
-            ProfilerEntry originEntry = null;
             if (ProfilerSwitch.isEnableSimpleProfiler()) {
                 Object fromInvocation = invocation.get(Profiler.PROFILER_KEY);
                 if (fromInvocation instanceof ProfilerEntry) {
@@ -99,18 +99,6 @@ public Result invoke(Invocation invocation) throws RpcException {
 
             Object value = doInvoke(proxy, invocation.getMethodName(), invocation.getParameterTypes(), invocation.getArguments());
 
-            if (ProfilerSwitch.isEnableSimpleProfiler()) {
-                Object fromInvocation = invocation.get(Profiler.PROFILER_KEY);
-                if (fromInvocation instanceof ProfilerEntry) {
-                    ProfilerEntry profiler = Profiler.release((ProfilerEntry) fromInvocation);
-                    invocation.put(Profiler.PROFILER_KEY, profiler);
-                }
-            }
-            Profiler.removeBizProfiler();
-            if (originEntry != null) {
-                Profiler.setToBizProfiler(originEntry);
-            }
-
             CompletableFuture<Object> future = wrapWithFuture(value, invocation);
             CompletableFuture<AppResponse> appResponseFuture = future.handle((obj, t) -> {
                 AppResponse result = new AppResponse(invocation);
@@ -133,7 +121,20 @@ public Result invoke(Invocation invocation) throws RpcException {
             return AsyncRpcResult.newDefaultAsyncResult(null, e.getTargetException(), invocation);
         } catch (Throwable e) {
             throw new RpcException("Failed to invoke remote proxy method " + invocation.getMethodName() + " to " + getUrl() + ", cause: " + e.getMessage(), e);
+        } finally {
+            if (ProfilerSwitch.isEnableSimpleProfiler()) {
+                Object fromInvocation = invocation.get(Profiler.PROFILER_KEY);
+                if (fromInvocation instanceof ProfilerEntry) {
+                    ProfilerEntry profiler = Profiler.release((ProfilerEntry) fromInvocation);
+                    invocation.put(Profiler.PROFILER_KEY, profiler);
+                }
+            }
+            Profiler.removeBizProfiler();
+            if (originEntry != null) {
+                Profiler.setToBizProfiler(originEntry);
+            }
         }
+
     }
 
     private CompletableFuture<Object> wrapWithFuture(Object value, Invocation invocation) {