@@ -53,23 +53,20 @@ public YarnClientAspect() {
5353 *
5454 * @param appContext application context when invoking YarnClientImpl.submitApplication
5555 * @param submittedAppId the submitted application id returned by YarnClientImpl.submitApplication
56- * @throws Throwable exceptions
5756 */
5857 @ AfterReturning (pointcut = "execution(ApplicationId org.apache.hadoop.yarn.client.api.impl.YarnClientImpl." +
5958 "submitApplication(ApplicationSubmissionContext)) && args(appContext)" , returning = "submittedAppId" , argNames = "appContext,submittedAppId" )
6059 public void registerApplicationInfo (ApplicationSubmissionContext appContext , ApplicationId submittedAppId ) {
61- if (appInfoFilePath != null ) {
62- try {
63- Files .write (Paths .get (appInfoFilePath ),
64- Collections .singletonList (submittedAppId .toString ()),
65- StandardOpenOption .CREATE ,
66- StandardOpenOption .WRITE ,
67- StandardOpenOption .APPEND );
68- } catch (IOException ioException ) {
69- logger .error (
70- "YarnClientAspect[registerAppInfo]: can't output current application information, because {}" ,
71- ioException .getMessage ());
72- }
60+ try {
61+ Files .write (Paths .get (appInfoFilePath ),
62+ Collections .singletonList (submittedAppId .toString ()),
63+ StandardOpenOption .CREATE ,
64+ StandardOpenOption .WRITE ,
65+ StandardOpenOption .APPEND );
66+ } catch (IOException ioException ) {
67+ logger .error (
68+ "YarnClientAspect[registerAppInfo]: can't output current application information, because {}" ,
69+ ioException .getMessage ());
7370 }
7471 logger .info ("YarnClientAspect[submitApplication]: current application context {}" , appContext );
7572 logger .info ("YarnClientAspect[submitApplication]: submitted application id {}" , submittedAppId );
@@ -82,12 +79,11 @@ public void registerApplicationInfo(ApplicationSubmissionContext appContext, App
8279 * This method will invoke many times, however, the last ApplicationReport instance assigned to currentApplicationReport
8380 *
8481 * @param appReport current application report when invoking getApplicationReport within submitApplication
85- * @param appId current application id, which is the parameter of getApplicationReport
8682 */
8783 @ AfterReturning (pointcut = "cflow(execution(ApplicationId org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.submitApplication(ApplicationSubmissionContext))) "
8884 +
89- "&& !within(YarnClientAspect) && execution(ApplicationReport org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.getApplicationReport(ApplicationId)) && args(appId) " , returning = "appReport" , argNames = "appReport,appId " )
90- public void registerApplicationReport (ApplicationReport appReport , ApplicationId appId ) {
85+ "&& !within(YarnClientAspect) && execution(ApplicationReport org.apache.hadoop.yarn.client.api.impl.YarnClientImpl.getApplicationReport(ApplicationId))" , returning = "appReport" , argNames = "appReport" )
86+ public void registerApplicationReport (ApplicationReport appReport ) {
9187 currentApplicationReport = appReport ;
9288 }
9389}
0 commit comments