Browse Source

fix aop typo error (#13047)

3.2.0-release
Aaron Wang 2 years ago committed by GitHub
parent
commit
2792c45fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java
  2. 2
      dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientAspectMoc.java

3
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 appReport current application report when invoking getApplicationReport within submitApplication
* @param appId current application id, which is the parameter of getApplicationReport * @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))) " @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) { public void registerApplicationReport(ApplicationReport appReport, ApplicationId appId) {
currentApplicationReport = appReport; currentApplicationReport = appReport;
} }

2
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))) " @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) { public void createAppId(ApplicationId submittedAppId) {
privateId = submittedAppId; privateId = submittedAppId;
logger.info("YarnClientAspectMoc[createAppId]: created submittedAppId {}", submittedAppId); logger.info("YarnClientAspectMoc[createAppId]: created submittedAppId {}", submittedAppId);

Loading…
Cancel
Save