From 3e3ee3d20b591a1cddbd19009c5dd5e63dfddf66 Mon Sep 17 00:00:00 2001 From: LoveEvenWong <39328362+LoveEvenWong@users.noreply.github.com> Date: Fri, 27 Sep 2019 10:23:09 +0800 Subject: [PATCH] =?UTF-8?q?=20pr#711=E3=80=80flink=20task=20edit=20(#906)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pr #711 flink task edit flink icon and add flink local deployMode task * pr #711 flink task edit flink icon and add flink local deployMode task --- .../java/cn/escheduler/common/Constants.java | 4 + .../server/utils/FlinkArgsUtils.java | 88 +++++--- .../js/conf/home/pages/dag/_source/dag.scss | 2 +- .../dag/_source/formModel/tasks/flink.vue | 1 + .../conf/home/pages/dag/img/toobar_FLINK.png | Bin 0 -> 2058 bytes .../conf/home/pages/dag/img/toobar_flink.svg | 211 ------------------ 6 files changed, 57 insertions(+), 249 deletions(-) create mode 100644 escheduler-ui/src/js/conf/home/pages/dag/img/toobar_FLINK.png delete mode 100644 escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg diff --git a/escheduler-common/src/main/java/cn/escheduler/common/Constants.java b/escheduler-common/src/main/java/cn/escheduler/common/Constants.java index 7eaa6b792..8522992f9 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/Constants.java +++ b/escheduler-common/src/main/java/cn/escheduler/common/Constants.java @@ -696,6 +696,10 @@ public final class Constants { */ public static final String SPARK_QUEUE = "--queue"; + /** + * --queue --qu + */ + public static final String FLINK_QUEUE = "--qu"; /** * exit code success diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java b/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java index 308103073..b7b69db78 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java +++ b/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java @@ -21,57 +21,70 @@ import cn.escheduler.common.Constants; import cn.escheduler.common.enums.ProgramType; import cn.escheduler.common.task.flink.FlinkParameters; import org.apache.commons.lang.StringUtils; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; /** - * spark args utils + * spark args utils */ public class FlinkArgsUtils { /** - * build args + * build args + * * @param param * @return */ + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(FlinkArgsUtils.class); + public static List buildArgs(FlinkParameters param) { List args = new ArrayList<>(); + String deployMode = "cluster"; + if (StringUtils.isNotEmpty(param.getDeployMode())) { + deployMode = param.getDeployMode(); - args.add(Constants.FLINK_RUN_MODE); //-m + } + if (!"local".equals(deployMode)) { + args.add(Constants.FLINK_RUN_MODE); //-m - args.add(Constants.FLINK_YARN_CLUSTER); //yarn-cluster + args.add(Constants.FLINK_YARN_CLUSTER); //yarn-cluster - if (param.getSlot() != 0) { - args.add(Constants.FLINK_YARN_SLOT); - args.add(String.format("%d", param.getSlot())); //-ys - } - if (StringUtils.isNotEmpty(param.getAppName())) { //-ynm - args.add(Constants.FLINK_APP_NAME); - args.add(param.getAppName()); - } + if (param.getSlot() != 0) { + args.add(Constants.FLINK_YARN_SLOT); + args.add(String.format("%d", param.getSlot())); //-ys + } - if (param.getTaskManager() != 0) { //-yn - args.add(Constants.FLINK_TASK_MANAGE); - args.add(String.format("%d", param.getTaskManager())); - } + if (StringUtils.isNotEmpty(param.getAppName())) { //-ynm + args.add(Constants.FLINK_APP_NAME); + args.add(param.getAppName()); + } - if (StringUtils.isNotEmpty(param.getJobManagerMemory())) { - args.add(Constants.FLINK_JOB_MANAGE_MEM); - args.add(param.getJobManagerMemory()); //-yjm - } + if (param.getTaskManager() != 0) { //-yn + args.add(Constants.FLINK_TASK_MANAGE); + args.add(String.format("%d", param.getTaskManager())); + } - if (StringUtils.isNotEmpty(param.getTaskManagerMemory())) { // -ytm - args.add(Constants.FLINK_TASK_MANAGE_MEM); - args.add(param.getTaskManagerMemory()); - } - args.add(Constants.FLINK_detach); //-d + if (StringUtils.isNotEmpty(param.getJobManagerMemory())) { + args.add(Constants.FLINK_JOB_MANAGE_MEM); + args.add(param.getJobManagerMemory()); //-yjm + } + if (StringUtils.isNotEmpty(param.getTaskManagerMemory())) { // -ytm + args.add(Constants.FLINK_TASK_MANAGE_MEM); + args.add(param.getTaskManagerMemory()); + } + + args.add(Constants.FLINK_detach); //-d + + + } - if(param.getProgramType() !=null ){ - if(param.getProgramType()!=ProgramType.PYTHON){ + if (param.getProgramType() != null) { + if (param.getProgramType() != ProgramType.PYTHON) { if (StringUtils.isNotEmpty(param.getMainClass())) { args.add(Constants.FLINK_MAIN_CLASS); //-c args.add(param.getMainClass()); //main class @@ -83,28 +96,29 @@ public class FlinkArgsUtils { args.add(param.getMainJar().getRes()); } + if (StringUtils.isNotEmpty(param.getMainArgs())) { + args.add(param.getMainArgs()); + } // --files --conf --libjar ... - if (StringUtils.isNotEmpty(param.getOthers())) { + if (StringUtils.isNotEmpty(param.getOthers())) { String others = param.getOthers(); - if(!others.contains("--queue")){ - if (StringUtils.isNotEmpty(param.getQueue())) { - args.add(Constants.SPARK_QUEUE); + if (!others.contains("--qu")) { + if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) { + args.add(Constants.FLINK_QUEUE); args.add(param.getQueue()); } } args.add(param.getOthers()); - }else if (StringUtils.isNotEmpty(param.getQueue())) { - args.add(Constants.SPARK_QUEUE); + } else if (StringUtils.isNotEmpty(param.getQueue()) && !deployMode.equals("local")) { + args.add(Constants.FLINK_QUEUE); args.add(param.getQueue()); } - if (StringUtils.isNotEmpty(param.getMainArgs())) { - args.add(param.getMainArgs()); - } return args; } -} + +} \ No newline at end of file diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index fefdbe670..beba0552f 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -71,7 +71,7 @@ background: url("../img/toolbar_SPARK.png") no-repeat 50% 50%; } .icos-FLINK { - background: url("../img/toobar_flink.svg") no-repeat 50% 50%; + background: url("../img/toobar_FLINK.png") no-repeat 50% 50%; } .icos-MR { background: url("../img/toolbar_MR.png") no-repeat 50% 50%; diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue index 1c3b18a64..497987b97 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue @@ -52,6 +52,7 @@
+
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_FLINK.png b/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_FLINK.png new file mode 100644 index 0000000000000000000000000000000000000000..3aab0231fa9a92f5529f8afc44438430f30f1ff0 GIT binary patch literal 2058 zcmV+l2=(`gP)s8H5wY-11Ft*bPx zTT!*qb*-jKtyDVE3Q%dsR$5ph3ZsDz!ZSPqc|aacjAQ(^udmOU4mDcjB#UXQZTBzx z`sZ^#=llEqe&-y5|AU8o4hGYl=|zi|)RjEg;|a|O27+?S+3v>f{^)L1RnLEp@o-NN z27_U8MVa%d^{ZypKQO;I*KU+88bI95dwhRs?C#xjQr_kEM)m;k14v{Flre(SqD3uAS&uIng^I@u%bAmk*qB{|Erj1SDf6 zQiJJV+C24{wbkmjEc-+qH&!5l91`t6$v6JtDC(SM*t4?KeOJAg51jJN$uuSR0zu4r zeM4b>?hCuWwxq(PS?D$W=|u62YqEiTgI;Vq&42c8JKs`k(3%Ik)z=!8kNx4mS^(j( z)EEmw2A~^fHrui+`pI==&KDibJbO)Py{>qYiTDon@hf?)TGh<)lGk6#U;JoqLQN(T zOC#m-;qc81yFBN=0wDfHAf)<=!X<^d))fQ6@Zu6vRbhQ$4TZsv*#SaHzeM!+fxq8= zQJq?yFTd1ufmaWh!cN)5FD3ojtL{%1`_%Bcu>i#HqbgD0aLlhQE&Kh_^5Uw1Cr^4{ zQiEbHHuA8yj~K#UVm)#R%~^haLl=*qkKU44h-wS$lX-Ryq`e(yj&*f<_J88*dL2My zERc~P#Jl3v)0Q?>Iw#wwW*5)a|t^Xia6I zB0D7V(YcmH^WV;f7P7qTQ<457`@`)!JA>Z8{wI?TgD@Bjb@h&AKi)8DbN$(9vzjaA zOVi|eI$1|}f~dST(!!hk?@_C4A(gpP*u0X7G&h@5YK`))P%j(&$2IQqNs^Js)J7EE zl?VoQN7}Z%-hbw`(G(d5Q9i-7W0UoT@01$ucbp41M?FcmRAHD!v!xsYod#l#Bik+! zla)y-@$sHWd$KEV8QE$W6MacCJ#LdMR3Qu?UP}UA1o?5d`@|2so91T>v7l(?$<s@I7?>eb7=aCZX|+?0^C9rs&P(?RAx6>C>mp0s73Yc`9XK%lNo!$WzAdprfb71 z7RBoPCw!=rr;udA0B^+0W3jWW+^i=yNjD5a>*Ga(!RYafJRyRz0Q(MC!_NB+dFvybP(3&=ku8*Q z4oV0VDh-1d7EG`tzo7=y#>ma@H?x6_PdqYEHnl7ub@XK=*S@T+?h6Dy%osuhuC$it z)Y>L&U1%(LGLIT9GNHotRLq{Lz+vNglQDKM+7-H}4mP*OZiSvLnAwnRVdP}!c3|7J zmb#!CynIg(sbFcDV@k~eqwDE9L&1V##U@kS;TZl9Kq$pI<5xAm_Pze5Rn;cvW7Ycc zyTGH!l$Zb81zYGe?*$iE-u&PN$ZB)LzE@>@I>{>0aPp%`|X zWKeS2VgsT{X=6c@0Vo|INE}w105kyjBY>v?h_hocfY|^J0tk+^O9H3@@Bx4w0CuLw z-(Ar!0X#dxU_JoT0DKj|+W@uzcr^vK2!Lon&u0KJ3&1G=KL_xuu^=`8xHKe4NGMwE zsv!`s01$%;h_?WEzHEpZ0H2O9=(;qB?9VD0-2jpR#sM$^=m$^@U_5|k0KEWM3VNs# zA_E1fLzO!{9YXFaLmSfz0Hy=TNgZ%E0@#-ZA=398 zfUN+;Md_(@h*(-{6{}eaU_}~)80e<}CIb){{TaY_hd>D52_p-G z?gH?bm@ged9MLZfQ9_&#MR|$$ca14LF&acZ05rb$3tKQzIe#L0Q+Q4pG}?LrT_o{07*qoM6N<$g6@UQJOBUy literal 0 HcmV?d00001 diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg b/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg deleted file mode 100644 index 33ba8b7b3..000000000 --- a/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- GitLab