Browse Source

#4154: [Bug] [Master] Workflow keep running when task has no id (#14315)

* change completeTaskMap to completeTaskSet

* Update dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* change method name

* fix ut

* fix spotless

---------

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
git-as-svn/v1/dev
旺阳 1 year ago committed by GitHub
parent
commit
f2dd3832de
  1. 2
      commit.ref
  2. 205
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit d4921fa2dda541d0fa3a198dd3052b61a73f2d37 Subproject commit 465e7ae6ee44d50f6f319ddfaab82bdf77fec0e5

205
commit.yml

@ -2,142 +2,73 @@
branches: { branches: {
} }
fileChange: fileChange:
/dolphinscheduler-api: /dolphinscheduler-master:
newFile: !uuid '5ef6b38b71a21b5c37339255bbd4d43c83060ac1' newFile: !uuid '99c90e5406b15687e18d956f9805c66edd63f9f6'
oldFile: !uuid 'de6cdcae6863f800ca0837b9ad318a9a44e296be' oldFile: !uuid '6b35882b07f48d97947659da1538295a8f51047e'
/dolphinscheduler-api/src: /dolphinscheduler-master/src:
newFile: !uuid '6607acf4750b0610c712656066ccde8996c9b88f' newFile: !uuid 'ddd0835a8425bf1055fc6c67484a9d807da2542b'
oldFile: !uuid 'ee3c60d8e1e499160d2ac1f9080350929342abf9' oldFile: !uuid '3d62c3f44e1b0ba0f80ac63a55f0326ddf1e53f9'
/dolphinscheduler-api/src/main: /dolphinscheduler-master/src/main:
newFile: !uuid '4c38d302eac51d7c718809af6dbd27df8d8dcfa9' newFile: !uuid '016dfc2caaa1fcc9dc28ad4a98a8d547e4b9dab8'
oldFile: !uuid 'e3619bbb77e6d4fff8061cc7a62df6c1b245839e' oldFile: !uuid '6787df7c65a30c48a4b0856ec9cb5ed232ff73f6'
/dolphinscheduler-api/src/main/java: /dolphinscheduler-master/src/main/java:
newFile: !uuid 'e40d118bd52f1427d8a6e1976dbc24fcfb4fe2fd' newFile: !uuid '06cb0d05120f635eb21c0a76441c6b1941046d8f'
oldFile: !uuid 'ed9ebc09fc131bdb9bfd5244bef4008c174ef40a' oldFile: !uuid '3729ade614cc79b762afa00e1ee8aef5a5b21f1e'
/dolphinscheduler-api/src/main/java/org: /dolphinscheduler-master/src/main/java/org:
newFile: !uuid '948a661095a3c5771e8c860d427203c92efe577f' newFile: !uuid 'c6c2886a561043260e2f82cc4bf44d422d9de072'
oldFile: !uuid '7b0700ac17def4ba0136dd6b7391cccf9e40c266' oldFile: !uuid 'c823bcf2e01452dc2dd89e202c68d1aac2ed230a'
/dolphinscheduler-api/src/main/java/org/apache: /dolphinscheduler-master/src/main/java/org/apache:
newFile: !uuid '1f77ac2b8bacd2e91744a770c2f0297c61a5f8ea' newFile: !uuid '01619bf7b75bdfd3f16b935de026f12bc1937350'
oldFile: !uuid '59694bb5ba870a22826596613df2fa160e49fe55' oldFile: !uuid '37cfd71239b85aea76849ec98db9136227a8000f'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '4c926d9ee2013057ed159c0aa0ff3f3df3c2643a' newFile: !uuid '6c7eb69266eae5553eb5c37e8ba1495328b842ad'
oldFile: !uuid '8b2a48e1a1169a3301b05ab66e586556b3538dd9' oldFile: !uuid '5b06a5458d04d03a3125ea81698dcddb23ee23ab'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid 'f10d98fa7cf24712df74e4972aeed6cd26d90152' newFile: !uuid '43a64b9c8d5d5b6cfc19cc1e1a17bdf78b82c346'
oldFile: !uuid '728e0a1cc7bf982334c5334091d4d5741f571098' oldFile: !uuid '76091bb7c776fa17061cc7c9562a5e866239beea'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
newFile: !uuid 'f8fa44affe11f610055b671f287ef7b6c9aa7bae' newFile: !uuid '28645ddb242eb1a9f111aabffe3086a2b8a90f43'
oldFile: !uuid '0d311dce73bf4093a09db76698aafc4bd4c58fcd' oldFile: !uuid '5b513a8679eef0ec2340b53cebc0e0ac897ac7dd'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event:
newFile: !uuid 'e7f763e98efccf6c40ef924c7911fe092cc5209a' newFile: !uuid '61a5613bc42da41eb34707b8e1866f9f67d22023'
oldFile: !uuid 'a7451626a24cb179cfc077981089660e8ed86fa1' oldFile: !uuid '690783be7e3c91cec76bc861d10f68503aec5782'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java:
newFile: !uuid 'bae5142637e89c2e738067871f0f7336a6a4f73a' newFile: !uuid 'cf9fc262adb9a78da25e98b894b3e4384c64aa1d'
oldFile: !uuid '56f18883b2b490a06699ed0aa7a5b13852e2f27c' oldFile: !uuid '524d0d4a6ddec70751f3b6ae8843a179c35a145c'
/dolphinscheduler-dao: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
newFile: !uuid '53ecc2ba38f54c46bc1258d30caff48d961527a6' newFile: !uuid '6de0f24f76cd4d1315dc05091abe0e559665d396'
oldFile: !uuid '3454075ebd1518b87d80193504124407b6789945' oldFile: !uuid '97640fc37c1d75a7294987d28969631f2c0e3b7a'
/dolphinscheduler-dao/src: /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
newFile: !uuid '798e5cb671c6e737d07a4abc301ab0fa44d34cf5' newFile: !uuid '88a1937b59700beac15e92e96d8de601fefd3957'
oldFile: !uuid '73c9128db4ec500a292283fc895b99e45042d614' oldFile: !uuid '1564adbc14012c061fedaab5528b5f700a242855'
/dolphinscheduler-dao/src/main: /dolphinscheduler-master/src/test:
newFile: !uuid 'a6aa4ee34eb77ff3c9883c460418bfa8ee17b3c2' newFile: !uuid '41f9186444bcef9b009da47066d1c1499655d16c'
oldFile: !uuid '10fb86f17a49bb654c335c0c72262fb1c9fb222a' oldFile: !uuid 'e239a82c1b1352a4a9ab929f1e20292aa118a94e'
/dolphinscheduler-dao/src/main/resources: /dolphinscheduler-master/src/test/java:
newFile: !uuid 'ce6092ebc7aa4f01118f01f07baffaee902180a4' newFile: !uuid 'daec8df1ed2fbd5e7162cd3ada46e09201aef268'
oldFile: !uuid '1c8e4a8591c3ebca393777ea8e86128d400bcb17' oldFile: !uuid '7f8b94d0c3ea5ab5dd4b5ba9b67927ed866cbb45'
/dolphinscheduler-dao/src/main/resources/sql: /dolphinscheduler-master/src/test/java/org:
newFile: !uuid '65985fdf6284e6dd3c82d5a1617906d5c8bdae2b' newFile: !uuid '3e571a3a0e7111c8f179db70dfb8823fd8fcc468'
oldFile: !uuid '77f9773effa10b94867357d226cc003045068395' oldFile: !uuid 'b0d0cae097477b566091be597ffbc86c1c6763fa'
/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql: /dolphinscheduler-master/src/test/java/org/apache:
newFile: !uuid 'be6e347f2c9cbb924e843613140fe0d960ed09d9' newFile: !uuid '5cd098c79500b5f47cc8f030182fdd3bfd8cbad0'
oldFile: !uuid '1158e79c4c438be56f89f0e3133d35718acd68bf' oldFile: !uuid '567b451f5fef4676641f76196dbaa54a693c101e'
/dolphinscheduler-ui: /dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler:
newFile: !uuid '64afa1837b066ff0821dbe26e8f2feac39a1b15b' newFile: !uuid '43a9dc82386c54f2364109dcb931ed42bdf39e39'
oldFile: !uuid '6a0d157d29c8943f150314e0db3f6e8b39d15397' oldFile: !uuid 'cd76e116d1c084eac81c352569318afbd8f354d1'
/dolphinscheduler-ui/src: /dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server:
newFile: !uuid '2b7aedcb75708f02e520d1af667b07a7ca2b615d' newFile: !uuid '9c09db6d4f77e0afee9d31957aabc2ba89de38e2'
oldFile: !uuid '59a62a38e1d721d9f3b2b43d36b1a13e9c3ee4b4' oldFile: !uuid 'a72ab91606207cad22d7bb69c1100020efda0ff5'
/dolphinscheduler-ui/src/layouts: /dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master:
newFile: !uuid 'f536f9dcc2bed1d84f73cf63d5697f2b321e9f53' newFile: !uuid 'eee69cbb2c0b375e18f35a3a0cbc028218e53fd7'
oldFile: !uuid 'c6585f88b343638e5641b6e84a80dde66a76f4d6' oldFile: !uuid '0e43047ab0fa9a78f0e3f480ab8be2384616b0f0'
/dolphinscheduler-ui/src/layouts/content: /dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner:
newFile: !uuid 'd79a99874526b678350eb780bc9bb23b01ab2cea' newFile: !uuid 'f369295b097b23294de869a64f89e519ffb5e118'
oldFile: !uuid '6268d30d8891f90178c01d1fac88190369b50c72' oldFile: !uuid '41a6e19d92b5d3a4cdc84d9caec4a420db959c96'
/dolphinscheduler-ui/src/layouts/content/use-dataList.ts: /dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnableTest.java:
newFile: !uuid '379073d2a15e5d6aa0782d9c144fbc05bb595bee' newFile: !uuid '26b637fd1c22c10a86867f4979ab37debc9b6216'
oldFile: !uuid '1815fb524a3650f5b1b370619137e34ff03bfe68' oldFile: !uuid 'f224ff36c63cd30370321ba6f5167e5c73489233'
/dolphinscheduler-ui/src/locales: gitCommitId: !uuid '465e7ae6ee44d50f6f319ddfaab82bdf77fec0e5'
newFile: !uuid '7c2706910327fd99418535850f6ba4e33a378046'
oldFile: !uuid '95f87592bc4305398a5d5f032edae4049d01c634'
/dolphinscheduler-ui/src/locales/en_US:
newFile: !uuid '39b62791a7344273e5a90895c469a99b72ede59f'
oldFile: !uuid '37aea3ca0df37ac7ab2384df446eaa6b0baa2dbd'
/dolphinscheduler-ui/src/locales/en_US/menu.ts:
newFile: !uuid '30d8b6f72a097daef52728aa3fb34c09dc381432'
oldFile: !uuid '1a49c561c771c03e22f88e282a6b7dd610b4b40e'
/dolphinscheduler-ui/src/locales/en_US/project.ts:
newFile: !uuid '6bb98be1a13328b3e2563ff27b49938d086f8f98'
oldFile: !uuid '1e63ecfc22853a3c0e6339c8a9e1978dcc0afd0d'
/dolphinscheduler-ui/src/locales/zh_CN:
newFile: !uuid 'd7abcec6765698cf60fdda318885fe6d3fcab1d0'
oldFile: !uuid 'ed6bf816eec33fb7fe5353140e97ce47cec698ca'
/dolphinscheduler-ui/src/locales/zh_CN/menu.ts:
newFile: !uuid '8f1f75d9e7c7c8509646450c680f27a91d8994ea'
oldFile: !uuid 'a29be3468796a85478118cd45f7e9c75ea477dc1'
/dolphinscheduler-ui/src/locales/zh_CN/project.ts:
newFile: !uuid '6fc276aea50418695106b0ec5eed2ac176315000'
oldFile: !uuid 'b0248d480abab7f8579ca938fd39633babd90d44'
/dolphinscheduler-ui/src/router:
newFile: !uuid 'b65b4f2f7b2d6877bf86d6b642b9753bb5dd8fea'
oldFile: !uuid 'a487b758483d8bedf1ecc005faf027c7d037dbf7'
/dolphinscheduler-ui/src/router/modules:
newFile: !uuid 'cb60622b138c7c57e184f71c8719b0fd20e86e11'
oldFile: !uuid '0e1eaedd308c62d1fc686ffe6459e306900b89bb'
/dolphinscheduler-ui/src/router/modules/projects.ts:
newFile: !uuid 'bcc508ac953b364ba13e3e50fa535371071a2308'
oldFile: !uuid 'e0b05b051dfad037a977ed310da9e9719c22cbf4'
/dolphinscheduler-ui/src/service:
newFile: !uuid '7775fe46db5a636ee7a1f518b266659b663d0a17'
oldFile: !uuid 'cc196ac68cd2987faa169fa403f25657f4d7a9c4'
/dolphinscheduler-ui/src/service/modules:
newFile: !uuid '03376df1937e069aaec420854ae7ff64ef73ee6d'
oldFile: !uuid '70e5557f102eb990af33ae8477626152188f6880'
/dolphinscheduler-ui/src/service/modules/projects-parameter:
newFile: !uuid 'dc0c17fdeb1a1ca6509ea86a44d5f0f2f35abf68'
oldFile: null
/dolphinscheduler-ui/src/service/modules/projects-parameter/index.ts:
newFile: !uuid 'be8d8ad56d4dff59c736439749c9437089f80580'
oldFile: null
/dolphinscheduler-ui/src/service/modules/projects-parameter/types.ts:
newFile: !uuid '9e0f74713631120c8bdad25f92504d7fe255cd54'
oldFile: null
/dolphinscheduler-ui/src/views:
newFile: !uuid '0b1780804765b6abebda6c822586178c39045a5d'
oldFile: !uuid 'd7ec71132e895276f6006f229967d6e82fa64e89'
/dolphinscheduler-ui/src/views/projects:
newFile: !uuid '19d4bc1f06d1fc0eef348bbb77a356c4e7c51909'
oldFile: !uuid '8c7a503e84619076285e127fcd586e10f211539d'
/dolphinscheduler-ui/src/views/projects/parameter:
newFile: !uuid '7e22e77987ade463c6d555c3bb4cca996f13e9ee'
oldFile: null
/dolphinscheduler-ui/src/views/projects/parameter/components:
newFile: !uuid '65bd1e6bf2bd73c5cf5e0c18f997c1eb7564b05b'
oldFile: null
/dolphinscheduler-ui/src/views/projects/parameter/components/parameter-modal.tsx:
newFile: !uuid 'c69ae864b2095a73bee7e1f52fa2570dfe086ad4'
oldFile: null
/dolphinscheduler-ui/src/views/projects/parameter/components/use-modal.ts:
newFile: !uuid '56b51868460b0afbc19851e4ba62800ac62f118a'
oldFile: null
/dolphinscheduler-ui/src/views/projects/parameter/index.tsx:
newFile: !uuid 'f8d0719f18c6dda1ce4a5497599b43ba75e7119d'
oldFile: null
/dolphinscheduler-ui/src/views/projects/parameter/use-table.ts:
newFile: !uuid 'e0d4b940cf13819c75f747c0f53d56e331811a4b'
oldFile: null
gitCommitId: !uuid 'd4921fa2dda541d0fa3a198dd3052b61a73f2d37'
renames: { renames: {
} }
revisionId: 4153 revisionId: 4154

Loading…
Cancel
Save