#4186: [Fix] Fix running task instance throught api gots failed (#14433)

* update logic * split method
1 year ago · 3ab3adad31
2 changed files with 42 additions and 159 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 76b1eefb68a7a6333c6b93987e5d3e842eabb2db
+Subproject commit d38d504332042fcf60b6560284e4eb729600fbbe
--- a/commit.yml
+++ b/commit.yml
@ -2,163 +2,46 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '21b14c3984a36be49ec36130cefe881fd757a5f1'
-    oldFile: !uuid 'c285187345fe7c57fe2527ae8c47d4aed47cdf99'
-  /dolphinscheduler-api/src:
-    newFile: !uuid '62299fd143d4eadfaaf33e37f0e0e0f8ba877016'
-    oldFile: !uuid '3498d3345a923adda2ce6a3ffb1ea18911be3d91'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'e9742a8d932d05282659f28272079609906c8c3a'
-    oldFile: !uuid '5c90d020e39193d7f50797b5847fae2685eedcb8'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid 'e38039d0811d80338e3936c7bd30e42895419b77'
-    oldFile: !uuid 'e59cae0557fdfd5f3c8af9caa6ae1219f8c3412c'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '6f0759bcee5d00221667735ef3ec75bcb7e2edd6'
-    oldFile: !uuid '8755eb492f7a03df1810f97cea6261c8004acd4f'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '9beefcaf5cb86bd39cd6e4f43a528bdb84d18d05'
-    oldFile: !uuid '8149ea512a9fbdeb2444062ae11e6112869d0191'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'b0db07ab1e904d1b8b821e8b38b769b5b253c27a'
-    oldFile: !uuid 'f0df86100d1507d4d0f88f8161c36e385dc07a98'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '5442b6c4f3f708272c988b4c81b61f24e9ed4c01'
-    oldFile: !uuid '8883036cfd66ccd505ddf6d0079683de44463895'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller:
-    newFile: !uuid '965b3bdb7cf2421730279f3664f8691973d8c81e'
-    oldFile: !uuid '02661d793ef82165c104ee02a8235c48b3e817f6'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java:
-    newFile: !uuid '5151665b34f40919d7dd3db07fad23bdffacdacf'
-    oldFile: !uuid '0cd3a59346738348de1160bd22e36bb88f04e321'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums:
-    newFile: !uuid '9dcf5606694a980c4639073d2ea814200698cad2'
-    oldFile: !uuid 'abe3dd429c690c7f9c65877ac8e69c9f226e402b'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java:
-    newFile: !uuid '7cc5c22c93215587b1fcfbb93edaea62e6dc3a09'
-    oldFile: !uuid 'eaa6300ac2fde89adfbb09504127d4392934ffa7'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python:
-    newFile: !uuid 'd90f0acb9ee57e9781a5e0acdbbf36db97af3cc0'
-    oldFile: !uuid '555926a1174e0f7af66049df0913be11a2f3e412'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java:
-    newFile: !uuid 'fe57f12d16fb7df58d15b01afaea6d09be4067c4'
-    oldFile: !uuid 'a40a89db309b4fe99b0e7560ef242225fc6b559f'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'f34b2c887918c91400b384fa560346c8b240f640'
-    oldFile: !uuid '6bb913964e505b00362163a73b8c537b1b8e01d7'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java:
-    newFile: !uuid 'c67f790c344492b8e9b97ca4e26a114d051fe3ea'
-    oldFile: !uuid '9e8ee66de050733e1886bb8842a1353816a7b2aa'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'dd777538a307c771aac270e6b993aeeb6cf2b265'
-    oldFile: !uuid 'd6fdbdceaded3a9c72318be39b9fda37ca914d38'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
-    newFile: !uuid 'ba996a46eb659a5b8294d4c248e933b19a2f00a6'
-    oldFile: !uuid 'a707beab0f0f2298a9ff13fe3ced15d13072b089'
-  /dolphinscheduler-api/src/test:
-    newFile: !uuid '5203f8a549c00daa3865974c331b78efa440442d'
-    oldFile: !uuid '9e6911d800ea9af06a5ef8645a6fdc8f1e4874ca'
-  /dolphinscheduler-api/src/test/java:
-    newFile: !uuid '929ee48e1175f524fb900d38382840a98993f3f0'
-    oldFile: !uuid 'ae0824e73d7bafa5d20afd5982dd7f5ad27877a7'
-  /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid '27f2861a81c13b42813f7ee5ba37317e281df141'
-    oldFile: !uuid '1a225267beb1ef35576e415a44d37b4605a3aa59'
-  /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid '5b111c7f8a83b4da825f08308c0284f576415187'
-    oldFile: !uuid '1cea4c9ae926a71d77f566d67e8ca425160ac2f2'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '8180f252124c2ec3fb3e3c8b3a962f98bd79474e'
-    oldFile: !uuid '2337e9ad58fa046dc28c0fb3216ca2fb2d7a3217'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'dbb1929f0b96a71ba3d8e90561d03e7d9f40409d'
-    oldFile: !uuid '6fee8cc756e4bb6b6ec9fb2708d6b957c53bf683'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller:
-    newFile: !uuid '5ee7faeb1b56eff7fdf1f12d35579df7627c68ca'
-    oldFile: !uuid '5fe188ba4da8b5709478d2c0b81071f1f6ad6afb'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecuteFunctionControllerTest.java:
-    newFile: !uuid '7cd97a55514437427b0e20d7af0817d416c04027'
-    oldFile: !uuid '83f66dbeac44c45cf5e54e444268e1458e3f1e08'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '057216d17a42945c3db2231fd7e7cff2e1aa565e'
-    oldFile: !uuid '01ad990700079ec2f50af6935c519c3193144603'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecuteFunctionServiceTest.java:
-    newFile: !uuid 'ff2aad42cc6dd3a20c03ccd1695f3a99f94bc821'
-    oldFile: !uuid 'eba1f34e1709e6b9e93af89476dfcdab67d7ea9a'
-  /dolphinscheduler-common:
-    newFile: !uuid '1731974c5e07e86559db05bc572f21396fb543e4'
-    oldFile: !uuid '67d2628d7067c2ef92cd4321bc1d3520570b0cdd'
-  /dolphinscheduler-common/src:
-    newFile: !uuid '337b3b07fd2d67ff99da520631f46f7d27b54893'
-    oldFile: !uuid '10e87803b41f30a3410e4ed5427bb1c5169778b0'
-  /dolphinscheduler-common/src/main:
-    newFile: !uuid 'f50620442ceae4b9c325d226dda6e71ec0cb7399'
-    oldFile: !uuid 'd5257db2796b38b44b09eb1bb3cfe2bc537cb60a'
-  /dolphinscheduler-common/src/main/java:
-    newFile: !uuid 'ed303b5937b36c239243f3108e83ffefbeea0137'
-    oldFile: !uuid 'e0a65632a70b3b6596afe5f18a62ff79e238ebf7'
-  /dolphinscheduler-common/src/main/java/org:
-    newFile: !uuid '3a677909de321ca76ba12029c45231a6c88ccede'
-    oldFile: !uuid '95d3876279cd9529a9f3618762bffe27fbfbc2f9'
-  /dolphinscheduler-common/src/main/java/org/apache:
-    newFile: !uuid 'f8e816b3b5aeab9b7e7d2fa6cd013b50d21369c9'
-    oldFile: !uuid '488432464416597e58d506a8825f6c19937fbad9'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '8c6b4e78156cef2276894ff684283dd29b8b6430'
-    oldFile: !uuid 'ee1f3069d5d19b0bc1705b885f64314e0d4bd0e7'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
-    newFile: !uuid '6beb4a072d4eb4ab1c9a1eb16e2da94ffbff31d9'
-    oldFile: !uuid '8bd103c7f2d727507dca77bf26f65d69677d7b32'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums:
-    newFile: !uuid '3314e46bc78c03c9db52bedaefaca802f7a770f7'
-    oldFile: !uuid 'ba2cb56331a986e9e640a44aa875dbae801f981c'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionOrder.java:
-    newFile: !uuid '4c82d291dc66d97078f9022cd05bc59352b5dd2a'
-    oldFile: null
-  /dolphinscheduler-ui:
-    newFile: !uuid 'a94582740f6d575dffb712bcf3bf7be72e62f10d'
-    oldFile: !uuid 'cc0a495ce527ebd4fe55f98162018731cec4d790'
-  /dolphinscheduler-ui/src:
-    newFile: !uuid 'fc0a9435b0508c12b1e1b8def57de22abcae3f8f'
-    oldFile: !uuid '97a54a80dfc117644baaa1bfe04f5f80e23f7ae3'
-  /dolphinscheduler-ui/src/locales:
-    newFile: !uuid '7bc841316371004af2684dd14bb0ac4196f6173c'
-    oldFile: !uuid '2b0237a9c4b7b920461e27cd69dee745a9a439af'
-  /dolphinscheduler-ui/src/locales/en_US:
-    newFile: !uuid '698e703a1bcf492ac3a6b374170bf9082d0effa7'
-    oldFile: !uuid '9836ab70a2bb9a53d6c080c7059f48365e133552'
-  /dolphinscheduler-ui/src/locales/en_US/project.ts:
-    newFile: !uuid '091af80c99dde6b4d08b1c5358cb0b047a5a5d6a'
-    oldFile: !uuid 'fa690104132444e6bc626ff5d50c5b7a8cfa211e'
-  /dolphinscheduler-ui/src/locales/zh_CN:
-    newFile: !uuid '83ab4108592781a01d0146c9ce1955e2128dc7d6'
-    oldFile: !uuid '425de5860d815a56ad0fce4b519311e0ce5da456'
-  /dolphinscheduler-ui/src/locales/zh_CN/project.ts:
-    newFile: !uuid 'c62f792bfe6dea241a0785e01673143ee2e340d5'
-    oldFile: !uuid '20d1bb89933b047b6ccb5f2f797cb1fd18e54863'
-  /dolphinscheduler-ui/src/views:
-    newFile: !uuid '0e6345e93093937955c8e73b8b7d225d8322364c'
-    oldFile: !uuid 'd6528d439ff1fa5cb342cc9af9d73e3a14ca5ceb'
-  /dolphinscheduler-ui/src/views/projects:
-    newFile: !uuid '7a26ea36f3e1148eba5ebb8a274939204d350c16'
-    oldFile: !uuid 'c05d58528279ed15ea5f99f7d06d12b512cd580b'
-  /dolphinscheduler-ui/src/views/projects/workflow:
-    newFile: !uuid '259d0e3f08f3b1efbbb58f51f490a25952af1590'
-    oldFile: !uuid '2c652ae0a48d1e29f35f963cbe661dd010167ecc'
-  /dolphinscheduler-ui/src/views/projects/workflow/definition:
-    newFile: !uuid 'cbbd27b0b93714d68c3598f848280c626682ae79'
-    oldFile: !uuid '43678d1e3066ab99b931573a2ec50566ddde8b50'
-  /dolphinscheduler-ui/src/views/projects/workflow/definition/components:
-    newFile: !uuid 'c9dc41ac7c457b69acd63acf566ddb4f3dacdfc2'
-    oldFile: !uuid '06123f4b57ad60d7c8d35209c8dd1aff3b887cc8'
-  /dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx:
-    newFile: !uuid 'f2c939a261ad65e1fab4f1b89cb238c99cb702ef'
-    oldFile: !uuid '45e24e1506018defca6231922f92b75cc2983c95'
-  /dolphinscheduler-ui/src/views/projects/workflow/definition/components/use-form.ts:
-    newFile: !uuid '2c5cf6820ab340231d88ab1a4f7f00ec38c0390b'
-    oldFile: !uuid 'aa07d9ad83c241379eab9982c3a477ec5b0408ed'
-gitCommitId: !uuid '76b1eefb68a7a6333c6b93987e5d3e842eabb2db'
+  /dolphinscheduler-master:
+    newFile: !uuid '3584ee70ab5019220193810c1595ff6e8a8fe828'
+    oldFile: !uuid 'b6e5960658d7dbe588bc9f749d403cf07797d0b8'
+  /dolphinscheduler-master/src:
+    newFile: !uuid 'a3f385c28e57ddd0963d73b248186a8d134ebe38'
+    oldFile: !uuid 'ad28c084b5a65c0e9db76ef71a855c086f556bee'
+  /dolphinscheduler-master/src/main:
+    newFile: !uuid 'f5b05a2216741386af1af2b6945c537848ca0265'
+    oldFile: !uuid 'c96ac72fda4dd5af59867bbd017a315281ef2e4f'
+  /dolphinscheduler-master/src/main/java:
+    newFile: !uuid '59b72a75414e502088bd0a694dd88c1bfdabaad1'
+    oldFile: !uuid '950b2e77d0a1a7ddd40d301d1138e169d8588096'
+  /dolphinscheduler-master/src/main/java/org:
+    newFile: !uuid 'fa59a32367211ef84261f6f82e04a674d04efbe6'
+    oldFile: !uuid 'ea6628be5eede9b9e51363e2d50cf8f6ac8de2d2'
+  /dolphinscheduler-master/src/main/java/org/apache:
+    newFile: !uuid '8082a97a8d173606ae5294bc9ac75d593733cccc'
+    oldFile: !uuid 'b3626b91aeecd64a983fc87ecadc1c8bce3d4a33'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'd170eafa94bbe4b65743da27ffe79084f74b0ac7'
+    oldFile: !uuid '4820fbf2ac1a7046822c91180862d62ff033d42a'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
+    newFile: !uuid '3c538b6aba3a0df7a50e5015592746612a42eed7'
+    oldFile: !uuid '2893a27c85965239aca80b867c01b4c54e3c1bab'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
+    newFile: !uuid 'bfc995a3f3f14639729e0f5fd4a87145981c428e'
+    oldFile: !uuid '9901cdb2577c1aa29183786a7e7a1b1f377eccc6'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
+    newFile: !uuid '5e70005f33ed17a1c379119e58de8e9a4daa9b0f'
+    oldFile: !uuid '246ac132eceb19fb5a8778bf1212b9a22e1e5104'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StreamTaskExecuteRunnable.java:
+    newFile: !uuid '40ef9e5df66a5006da162c2f22f913e04db4f3d2'
+    oldFile: !uuid '5f64a3c099e75ff0768061fb4628a4b03c9abef0'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute:
+    newFile: !uuid '15c3a1edafefd2033f2058e227ed41b099cae96a'
+    oldFile: !uuid '8a5a5c0e2045f317c27d4957c42f15258bfbd663'
+  ? /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute/TaskExecutionContextFactory.java
+  : newFile: !uuid '0153c81364a4fc5d49c425c8d5e95fdef62ba548'
+    oldFile: !uuid '03005ff70c2fa5b6159ad628dcdcdd24486f735e'
+gitCommitId: !uuid 'd38d504332042fcf60b6560284e4eb729600fbbe'
 renames: {
  }
-revisionId: 4185
+revisionId: 4186