[dolphinscheduler] branch dev updated: fix aop typo error (#13047)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 2792c45fb0 fix aop typo error (#13047)
2792c45fb0 is described below

commit 2792c45fb002c8db4ec313387855f3bd6fed860c
Author: Aaron Wang <wangweira...@gmail.com>
AuthorDate: Wed Nov 30 14:00:06 2022 +0800

    fix aop typo error (#13047)
---
 .../main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java    | 3 +--
 .../test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
 
b/dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
index 01c36ced3a..0b9375a36d 100644
--- 
a/dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
+++ 
b/dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
@@ -83,11 +83,10 @@ public class YarnClientAspect {
      *
      * @param appReport current application report when invoking 
getApplicationReport within submitApplication
      * @param appId     current application id, which is the parameter of 
getApplicationReport
-     * @throws Throwable exceptions
      */
     @AfterReturning(pointcut = "cflow(execution(ApplicationId 
org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.submitApplication(ApplicationSubmissionContext)))
 "
             +
-            "&& !within(CfowAspect) && execution(ApplicationReport 
org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.getApplicationReport(ApplicationId))
 && args(appId)", returning = "appReport", argNames = "appReport,appId")
+            "&& !within(YarnClientAspect) && execution(ApplicationReport 
org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.getApplicationReport(ApplicationId))
 && args(appId)", returning = "appReport", argNames = "appReport,appId")
     public void registerApplicationReport(ApplicationReport appReport, 
ApplicationId appId) {
         currentApplicationReport = appReport;
     }
diff --git 
a/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
 
b/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
index 96b155e7d1..92d80a424e 100644
--- 
a/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
+++ 
b/dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java
@@ -40,7 +40,7 @@ public class YarnClientAspectMoc {
 
     @AfterReturning(pointcut = "cflow(execution(ApplicationId 
org.apache.dolphinscheduler.poc.YarnClientMoc.submitApplication(ApplicationSubmissionContext)))
 "
             +
-            "&& !within(CfowAspect) && execution(ApplicationId 
org.apache.dolphinscheduler.poc.YarnClientMoc.createAppId())", returning = 
"submittedAppId")
+            "&& !within(YarnClientAspect) && execution(ApplicationId 
org.apache.dolphinscheduler.poc.YarnClientMoc.createAppId())", returning = 
"submittedAppId")
     public void createAppId(ApplicationId submittedAppId) {
         privateId = submittedAppId;
         logger.info("YarnClientAspectMoc[createAppId]: created submittedAppId 
{}", submittedAppId);