SbloodyS commented on code in PR #12197: URL: https://github.com/apache/dolphinscheduler/pull/12197#discussion_r1005266248
########## dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java: ########## @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.aop; + +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.Collections; + +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; + +@Aspect +public class YarnClientAspect { + + /** + * The current application report when application submitted successfully + */ + private ApplicationReport currentApplicationReport = null; + + private final String appInfoFilePath; + private boolean debug; + + public YarnClientAspect() { + appInfoFilePath = String.format("%s/%s", System.getProperty("user.dir"), "appInfo.log"); + debug = true; + } + + /** + * Trigger submitApplication when invoking YarnClientImpl.submitApplication + * + * @param appContext application context when invoking YarnClientImpl.submitApplication + * @param submittedAppId the submitted application id returned by YarnClientImpl.submitApplication + * @throws Throwable exceptions + */ + @AfterReturning(pointcut = "execution(ApplicationId org.apache.hadoop.yarn.client.api.impl.YarnClientImpl." + + "submitApplication(ApplicationSubmissionContext)) && args(appContext)", returning = "submittedAppId", argNames = "appContext,submittedAppId") + public void registerApplicationInfo(ApplicationSubmissionContext appContext, ApplicationId submittedAppId) { + if (appInfoFilePath != null) { + try { + Files.write(Paths.get(appInfoFilePath), + Collections.singletonList(submittedAppId.toString()), + StandardOpenOption.CREATE, + StandardOpenOption.WRITE, + StandardOpenOption.APPEND); + } catch (IOException ioException) { + System.err.println( + "YarnClientAspect[registerAppInfo]: can't output current application information, because " + + ioException.getMessage()); Review Comment: Please using `logger.error` instead of stdout. ########## dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/YarnClientAspectMocTest.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler; + +import org.apache.dolphinscheduler.poc.YarnClientMoc; + +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.exceptions.YarnException; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class YarnClientAspectMocTest { + + private final PrintStream standardOut = System.out; + ByteArrayOutputStream stdoutStream = new ByteArrayOutputStream(); + @BeforeEach + public void beforeEveryTest() { + System.setOut(new PrintStream(stdoutStream)); + } + @AfterEach + public void afterEveryTest() throws IOException { + System.setOut(standardOut); + stdoutStream.close(); + } + @Test + public void testMoc() { + YarnClientMoc moc = new YarnClientMoc(); + try { + ApplicationSubmissionContext appContext = ApplicationSubmissionContext.newInstance( + ApplicationId.newInstance(System.currentTimeMillis(), 1236), "appName", + "queue", Priority.UNDEFINED, + null, false, + false, 10, null, + "type"); + moc.createAppId(); + ApplicationId applicationId = moc.submitApplication(appContext); + String stdoutContent = stdoutStream.toString(); + Assertions.assertTrue(stdoutContent.contains("YarnClientAspectMoc[submitApplication]"), + "trigger YarnClientAspectMoc.submitApplication failed"); + Assertions.assertTrue(stdoutContent.contains("YarnClientAspectMoc[createAppId]:"), + "trigger YarnClientAspectMoc.createAppId failed"); + } catch (YarnException | IOException e) { + Assertions.fail("test YarnClientAspectMoc failed: " + e.getMessage()); + e.printStackTrace(); Review Comment: Please using `logger.error` instead of this. ########## dolphinscheduler-aop/src/test/java/org/apache/dolphinscheduler/poc/YarnClientMoc.java: ########## @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.poc; + +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; +import org.apache.hadoop.yarn.exceptions.YarnException; + +import java.io.IOException; +import java.util.Random; + +public class YarnClientMoc { + + private Random random = new Random(); + + public ApplicationId createAppId() { + ApplicationId created = ApplicationId.newInstance(System.currentTimeMillis(), random.nextInt()); + System.out.println("created id " + created.getId()); Review Comment: Please using `logger.info` instead of this. ########## dolphinscheduler-aop/src/main/java/org/apache/dolphinscheduler/aop/YarnClientAspect.java: ########## @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.aop; + +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.Collections; + +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; + +@Aspect +public class YarnClientAspect { + + /** + * The current application report when application submitted successfully + */ + private ApplicationReport currentApplicationReport = null; + + private final String appInfoFilePath; + private boolean debug; + + public YarnClientAspect() { + appInfoFilePath = String.format("%s/%s", System.getProperty("user.dir"), "appInfo.log"); + debug = true; + } + + /** + * Trigger submitApplication when invoking YarnClientImpl.submitApplication + * + * @param appContext application context when invoking YarnClientImpl.submitApplication + * @param submittedAppId the submitted application id returned by YarnClientImpl.submitApplication + * @throws Throwable exceptions + */ + @AfterReturning(pointcut = "execution(ApplicationId org.apache.hadoop.yarn.client.api.impl.YarnClientImpl." + + "submitApplication(ApplicationSubmissionContext)) && args(appContext)", returning = "submittedAppId", argNames = "appContext,submittedAppId") + public void registerApplicationInfo(ApplicationSubmissionContext appContext, ApplicationId submittedAppId) { + if (appInfoFilePath != null) { + try { + Files.write(Paths.get(appInfoFilePath), + Collections.singletonList(submittedAppId.toString()), + StandardOpenOption.CREATE, + StandardOpenOption.WRITE, + StandardOpenOption.APPEND); + } catch (IOException ioException) { + System.err.println( + "YarnClientAspect[registerAppInfo]: can't output current application information, because " + + ioException.getMessage()); + } + } + if (debug) { + System.out.println("YarnClientAspect[submitApplication]: current application context " + appContext); + System.out.println("YarnClientAspect[submitApplication]: submitted application id " + submittedAppId); + System.out.println( Review Comment: Same here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
