github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

#2680: fix task kill (#9578)

git-as-svn/v1/dev
caishunfeng 3 years ago committed by GitHub
parent
370468a126 b4017d0afd
commit
d2d5012afd
2 changed files with 36 additions and 129 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      commit.ref
  2. 163
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit c5b7e5adff40988f3dfd4f75dddb0b597509fff4 Subproject commit b4017d0afd29f2ccd497713d8a448125baf93313

163
commit.yml
Unescape View File

@ -2,133 +2,40 @@
branches: { branches: {
} }
fileChange: fileChange:
/dolphinscheduler-api: /dolphinscheduler-worker:
newFile: !uuid '326ac517be092152fc66086997888cc75d8b411d' newFile: !uuid '4cfef24711d0688f5bd8f8e514c1256eae588263'
oldFile: !uuid '19f06d93c6b416eabebec480ae716c23774ec0f8' oldFile: !uuid 'a5df6de15dc7652ef81aba579de1bb7c3741a28a'
/dolphinscheduler-api/src: /dolphinscheduler-worker/src:
newFile: !uuid 'ae137d0cea24e807077431dc7fa5b502233798fc' newFile: !uuid 'a7aeb06725699351c7d61c36a5786da1021b5eeb'
oldFile: !uuid 'fe838c82151ad97c8ba0e3f8736d9558e33c4f62' oldFile: !uuid 'ef5d9c6d1099c0c0746a0f3c9731fc25e88a1f8d'
/dolphinscheduler-api/src/main: /dolphinscheduler-worker/src/main:
newFile: !uuid '349baf9e833a04b3f4702384d6345d85d5be7717' newFile: !uuid '24f432db8320019a1847af78ccb3906f38781ba1'
oldFile: !uuid '3a0238d69f9d44fa943080f2dfb223079f237afb' oldFile: !uuid 'd064ffc7d1bae4071624e79c8da43fc1c5bdfb0d'
/dolphinscheduler-api/src/main/java: /dolphinscheduler-worker/src/main/java:
newFile: !uuid '7e32c49ee1f5457f104a297bd8c9e33bd7850eb3' newFile: !uuid '0fab3d531d1ce09b1130d755a4cb08cef62b928e'
oldFile: !uuid '25f8c5e469f6b9ff071ed6c752612cb26dbdcfc7' oldFile: !uuid '68a03cf2397d383217f249cde7369882fa63909f'
/dolphinscheduler-api/src/main/java/org: /dolphinscheduler-worker/src/main/java/org:
newFile: !uuid '25b1faa983fef720fcc714ce1bb4c03daecd36a6' newFile: !uuid '49e7a77bf5027ca34af218b2e66262cc4102505d'
oldFile: !uuid '12321062f76291a967b0eaf1db59ff19aa034502' oldFile: !uuid '509275b2f05e5b3ed21799159267a1673b016cac'
/dolphinscheduler-api/src/main/java/org/apache: /dolphinscheduler-worker/src/main/java/org/apache:
newFile: !uuid 'db0748bfa1543b8881f51d9044c25f50f8a14232' newFile: !uuid 'b2238cf1824ddb744453332ee8ac4321ffb91740'
oldFile: !uuid '1ba21449491cbf182b9a3096c7b770ee6eaac389' oldFile: !uuid 'f2b441dc5af5ee77ecac55e415fbde6e81d2fa5e'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler: /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid 'dd56988d588988fc0792b9fede74eaddd1bda9c7' newFile: !uuid '48e8feb0846ecfbbff50f55bcfe19e2ed593bb8f'
oldFile: !uuid '3d7b6ee03cfca86c8162354c3fd28dfdfbf57f77' oldFile: !uuid 'a928d3b1a0e5f00d5fe5a350d451ee3538bc3f14'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api: /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid '84c70986c5243e073bef538b5622bf056e0339f5' newFile: !uuid 'fd5f7bb921f2766e29552ccbb75c8e82e2f40cdc'
oldFile: !uuid '9f151f4331a3801662e1e9bef129045d48756187' oldFile: !uuid 'de5be168c896e2c0621fc30d370bb830c7b15164'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service: /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker:
newFile: !uuid 'ef0bd70ced235761eb767de53fdad0402c1d6638' newFile: !uuid '460cff4e941fa4794883977ad7ed5093c64aa8dd'
oldFile: !uuid 'b40c3ff937d2a26db13b0318b0b3cdff8eb5721d' oldFile: !uuid '7792308f3fdae8eda494ee4312194cb691ea8f92'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java: /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor:
newFile: !uuid 'cb4639acfc8915a1aff1b937acd7530303c4bb63' newFile: !uuid '50456f40dee9cd92d086ffe51023cf9061b27096'
oldFile: !uuid '80810ed40e1a87c9e1c19c8b65d4972b561f796e' oldFile: !uuid 'b072a87ab11acb47d4e4f377b546aa874e230a48'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl: /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java:
newFile: !uuid '2c20b058908fbea055db7ff83f875cbe5e21b66a' newFile: !uuid 'c3eb07b2ad17e1a506d707a1b63c35b8226fd518'
oldFile: !uuid 'deee44fe59b3775d36348e62ff2418ce03ffedce' oldFile: !uuid '9a0e8943d69be7aafc2126e850466998c439d718'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java: gitCommitId: !uuid 'b4017d0afd29f2ccd497713d8a448125baf93313'
newFile: !uuid '88449a49f081d76369a51971abbb036db456294c'
oldFile: !uuid '6617207a99a4c19e0c0a6426be81fe6b3e0e9c2e'
/dolphinscheduler-dao:
newFile: !uuid '2352d584441f2c9a109280eefa613adc0cad7d81'
oldFile: !uuid 'c589cfd8c2766f59ef853346e0f64608179f30a8'
/dolphinscheduler-dao/src:
newFile: !uuid '97653af5b14863a7a00531de77f6a871e5ec0d55'
oldFile: !uuid 'eb43a46e6bd54a8dcdbb86341a87622f932abf4b'
/dolphinscheduler-dao/src/main:
newFile: !uuid '12300b5734619147789d375817394ee5c1f84ec1'
oldFile: !uuid '7106f3baa56a51f91db66a6db8caebdb5fc5546a'
/dolphinscheduler-dao/src/main/java:
newFile: !uuid '9ebfcb6b55fd584a59c17db667e1b3fc9bb64b66'
oldFile: !uuid '25456690a4f06bd652b23254e64983e34cdc406e'
/dolphinscheduler-dao/src/main/java/org:
newFile: !uuid '7100f7a8fa395d051ede38a8558c5434a36b3b5a'
oldFile: !uuid '9dcced97394c39f76f33557fc2920c222263cb3c'
/dolphinscheduler-dao/src/main/java/org/apache:
newFile: !uuid 'ed4cd4307c5b75af6d0f2182ea8ad50fa61b4367'
oldFile: !uuid '495a01b186f9826c0d9b3c0883a25aa7e2cbfe9c'
/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid 'd62db337304540ebe0d8dad182e9fbfe7324977d'
oldFile: !uuid '44df2428a7d4e6ec4abf262e22428267511d8310'
/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
newFile: !uuid '14d423789f5885456e4cb7ba1fc1ecc93e00ca02'
oldFile: !uuid 'fcf1bc7f0a03b1727af1137272c9f67adaa426cb'
/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
newFile: !uuid '3cc2f57ec40fb621b7e410c9a793ebd94e9b37bb'
oldFile: !uuid '4168a8c9497c6093b0072e283bb36ed01e63382c'
/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java:
newFile: !uuid 'f98996952d88af4269638fadc3ac05d99281548d'
oldFile: !uuid 'a79a07ca27ccf5a5e784e2fcbb4f94fc559938c4'
/dolphinscheduler-dao/src/main/resources:
newFile: !uuid '37e5f03c4b7c0456aada92f91d81ab07fa585692'
oldFile: !uuid 'a2490238e2fcb707174f6639aac7289d03a0f4cb'
/dolphinscheduler-dao/src/main/resources/org:
newFile: !uuid '72d9b8d90e6628339cde9c4664f5557a40fc2179'
oldFile: !uuid '9f4cdaeaee31ba87c0c2e347422ab968a7a2bae4'
/dolphinscheduler-dao/src/main/resources/org/apache:
newFile: !uuid '523bf2d3ff8e78957e7e266a9d5ed5eabbb8e614'
oldFile: !uuid '9ea23074f1221f888270e80452779d8bdadf03c4'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
newFile: !uuid 'ae4a0a076808c946a5ddbf64ff5af679b3cf9d60'
oldFile: !uuid 'e5ded487647b511d605c72f044c8ef4d93a16756'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
newFile: !uuid 'd1f43035afd262b28f076efaf35b224a2c8eb1b4'
oldFile: !uuid 'f9739ea500e820d565f26373f2eacc722f2252ce'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
newFile: !uuid 'b67bc722222737cbf748547f2e715577ea59b2e3'
oldFile: !uuid 'bcaf232880208950b840e62afbfa8a6edbb0e022'
/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml:
newFile: !uuid 'adc470c1976d2f2ae500825691aa85796a95f9f8'
oldFile: !uuid '8ea8459cd43f9a88fd229e588ca041c11eebf612'
/dolphinscheduler-task-plugin:
newFile: !uuid 'c95e179f8b4d71ff267622d38dfb2c06f5a9ab1c'
oldFile: !uuid '9faa03daa9e996a80d58d6ee0b7a1e5b0bb18012'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api:
newFile: !uuid '14fc9fc5bceb68a24b8c27b39777e21203513f07'
oldFile: !uuid '9736b536380f429d5636c683e23c4f724df1b0b3'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src:
newFile: !uuid 'b3499934a78d4fadafb4ea0bc9f0780fd8328d98'
oldFile: !uuid '72285a65a03096117bd57a1f7ee788b07b5430d9'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main:
newFile: !uuid '72a911035ed4a1ed90756e53d83329745aa6ee74'
oldFile: !uuid '8ffe82423d7416048472cabd16fb9c1e71622f63'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java:
newFile: !uuid '20a1434d330ff58ebef848454d153f18b14b25c7'
oldFile: !uuid 'e915b5fa98b6a2714c456b7e04a695579a7bd1e2'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org:
newFile: !uuid '5cb5df909b2936e407fc772959b3b69fd7e9d026'
oldFile: !uuid '08868e0863c3df24766cc78f27a85cf7435c8033'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache:
newFile: !uuid '01d60c530111f0285de1574bb91ce30fb8794b01'
oldFile: !uuid 'c7bab64f50eeab2d40e592ecde355ac6dc8e4834'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid 'e00c01107605d8c844b8669e48d579bda6537ed7'
oldFile: !uuid 'e1257eb537c43a10f6368dbb7bf75090e1677ecb'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin:
newFile: !uuid '6f28b32e0e581fcceb915a18ed730b6f882ede62'
oldFile: !uuid 'a30e990e8aae7433f44e7732a0f7caf247f54cce'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task:
newFile: !uuid '037d77dc7c374d2d2a4de2dd9e7a1fc0bb8de951'
oldFile: !uuid '211bfbcf29de58169e9994c0d1352c337fc057af'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api:
newFile: !uuid 'ff17d748b3631de0f1e6ac21e1a589a1f0b1f754'
oldFile: !uuid '59137852767dcc1d4bf51ab3c908817d2fd522a1'
/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums:
newFile: !uuid '73afc81c46672435ca396d1cdffed9cff8c74485'
oldFile: !uuid '69a197ca1294039035bcbbe0313f38618c0aeb37'
? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java
: newFile: !uuid '82c8db12d43ee8c99b21927722400e8a774bd419'
oldFile: !uuid '8d2774c531d93aab0921262c0d9a6c50fec4e1f6'
gitCommitId: !uuid 'c5b7e5adff40988f3dfd4f75dddb0b597509fff4'
renames: { renames: {
} }
revisionId: 2679 revisionId: 2680

Write Preview
Loading…
Cancel
Save