Merge branch 'dev-upstream' into dev-phoenix-connector-laster

dlink-core/src/main/java/com/dlink/job/JobManager.java

@@ -505,6 +505,7 @@ public class JobManager {
             GatewayResult gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar();
             job.setResult(InsertResult.success(gatewayResult.getAppId()));
             job.setJobId(gatewayResult.getAppId());
+            job.setJids(gatewayResult.getJids());
             job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL()));
             job.setEndTime(LocalDateTime.now());
             job.setStatus(Job.JobStatus.SUCCESS);

dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java

@@ -73,7 +73,7 @@ public class YarnApplicationGateway extends YarnGateway {
                 applicationConfiguration);
             ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
             Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
-            int counts = 10;
+            int counts = 30;
             while (jobStatusMessages.size() == 0 && counts > 0) {
                 Thread.sleep(1000);
                 counts--;
@@ -88,7 +88,6 @@ public class YarnApplicationGateway extends YarnGateway {
                     jids.add(jobStatusMessage.getJobId().toHexString());
                 }
                 result.setJids(jids);
-                logger.info("JIDS =" + StringUtils.join(jids, ","));
             }
             ApplicationId applicationId = clusterClient.getClusterId();
             result.setAppId(applicationId.toString());