fix aop typo error (apache#13047)

ruanwenjun · Nov 30, 2022 · 2792c45 · 2792c45
1 parent 32a8241
commit 2792c45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -83,11 +83,10 @@ public void registerApplicationInfo(ApplicationSubmissionContext appContext, App
      *
      * @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
@@ -40,7 +40,7 @@ public void submitApplication(ApplicationSubmissionContext appContext, Applicati
 
     @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);