#3335: [Fix-11413] Cannot set task status to kill if the task is not in running(#11414)

2 years ago · 4bc411f9c6
2 changed files with 39 additions and 144 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 82177840442d09bf012d3fd3f1e9665581cf4cdf
+Subproject commit 496c2d4bfa9bcf72bd8c90a7732844b543c15610
--- a/commit.yml
+++ b/commit.yml
@ -2,148 +2,43 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '4c2fc22d7e288a4d8cd0b87c451d0a5c98b2ce5e'
-    oldFile: !uuid '0fab600fdcac21314570e6bb82f211d71d685586'
-  /dolphinscheduler-api/src:
-    newFile: !uuid 'e6acf658354c3705a178ef0271df797adee1103a'
-    oldFile: !uuid 'ca5cd22cf0405fe98782d3e31249dd0ac584c56c'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'b633c39c15fb28847c24ea354076d0d90c55d008'
-    oldFile: !uuid '358bdb075d055b5bcab28a31fa29bb35c9c4ae75'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '1ab94ac601105970ac4e28a59c514feece27b75e'
-    oldFile: !uuid 'dc910de25059e97fa0ff3abec7fa41530a05c620'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '93c3e9be51942cc6a248cf467a1ddc9a14497c23'
-    oldFile: !uuid '035ed9a4f8e5c06aa2aea664907390fce4a6f5a6'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid 'aacd5b4c5fd2067655a16dc0a31ac53ae63e3ebf'
-    oldFile: !uuid '0896b224cf717396080441eb0a30207a436f78db'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '34292e5bd0dd84667de8fcf0c608c1fd505a9da1'
-    oldFile: !uuid '293b28074e55083e15e578f1da560749177bb66e'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '3d78c3c0b3a332f37a0ac068f2c45296fe2212ba'
-    oldFile: !uuid '06829e1d54169f8977494a5c77daa41d4956dea3'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums:
-    newFile: !uuid '3b8b110760943aadde484b236161c66c0d3f5c66'
-    oldFile: !uuid 'bcaa970a303056ca8312cad5b64848f7dd28327e'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java:
-    newFile: !uuid '8dedcaac6a79c08db362efb5d3187fab3989f189'
-    oldFile: !uuid '5f7dc3a5d785edd8cc827ecfe3ceca51257c8cc3'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'cfb321a0a434cd7c3421d4ea436262bbf1f312c3'
-    oldFile: !uuid '85a52b8a034f6d830e92fbb3c306176a12f76fd9'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java:
-    newFile: !uuid 'a1fa21a9f1e3ab8b56d8388920f2c32bee4dd5e8'
-    oldFile: !uuid '558c079d45e03ae76951ed7874ee9931447199c0'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'c4b33dc37c575c0cb54812a4b08e9c7fd84b5685'
-    oldFile: !uuid '5589034f167d9c381da22fed4e75ab7c111d3a28'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java:
-    newFile: !uuid 'e683f5f2710d77a860bc9482530c949b3a7bd987'
-    oldFile: !uuid '8368dc1f64f3dfc2064c9c22e3cffa8350abe5e5'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java:
-    newFile: !uuid '5c616a7c33a28edb6751912d58c4100435578b75'
-    oldFile: !uuid '3dfe09d1eb40877d5b59b3daf7af81f5e96d0106'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java:
-    newFile: !uuid '0fb9a53b1c734543fb99173952ef2d532ce8e983'
-    oldFile: !uuid '38f1a0ff8a482db7146cd195b736b319c7b80fd3'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java:
-    newFile: !uuid '4080d6e3c670d4b42499a20210da0aaa93dd115d'
-    oldFile: !uuid '2799b61d40e31e80e0354818acc9a4f22e7f9d25'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java:
-    newFile: !uuid 'c3f2e970bffce559f610ff24cf4a4fb9058bb4b1'
-    oldFile: !uuid 'dc410e665894b0de551b3b0202782a082157dd5f'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java:
-    newFile: !uuid 'e1c3f064b8288d7979df36168bb336bb35a4f583'
-    oldFile: !uuid '88be8043077e67a68c7135b8558a96086c959596'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java:
-    newFile: !uuid 'fe64031c486af0463b927bffff9cf815f6c144bb'
-    oldFile: !uuid '85283eb0370d8dcfcede8245ef536c51784da70e'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java:
-    newFile: !uuid '21dd5e0d5116a93bfc22009d7208933b167c446d'
-    oldFile: !uuid '16e230a705b9248e5e7fecfe8a10c89d814169ee'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java:
-    newFile: !uuid '90118baa84260cff0286af3a9d3caaf1a56fd33d'
-    oldFile: !uuid '4b567670e245fbe78dfd573f2069e228c969dbbc'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java:
-    newFile: !uuid '994a3a0f74a857639cbb443c137490d7f691f7a6'
-    oldFile: !uuid 'f07966af76970472d75e2c561c02e92a9affd70f'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java:
-    newFile: !uuid '486a9c4af2816f14710a2f8a60993e47204c7b9d'
-    oldFile: !uuid 'c46f4aabfb73192b547fae131e5c768a1eea7a0a'
-  /dolphinscheduler-api/src/test:
-    newFile: !uuid 'd826be9f94754fc12e87e1a4b4de330ffca9b686'
-    oldFile: !uuid '82b95f70ac4e254bd939fb2359be86b00aee0275'
-  /dolphinscheduler-api/src/test/java:
-    newFile: !uuid '9d5e2c650f4e15adb73fea32ec5db9ff79687f36'
-    oldFile: !uuid 'd048e83c5e8030adcaadfbd114a48856f8c77c29'
-  /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid '2f2c5a11f917e1e8e89a0569c683a54dd809f6af'
-    oldFile: !uuid '7a6250bf0f513d9ed3d3f32231a49c759d6785ac'
-  /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid '872e32b2d1756cc5186cd347ef13bf172ce2c3fc'
-    oldFile: !uuid '3bb91c20d101c6ff93d0e550887e281365f7eabd'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'd7d0cb7c87fbf91f49e241382fd528b30cfe4776'
-    oldFile: !uuid '4332faa2987000dd4cddb5ca0215b98f036552ad'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '58b27e622fae55444eb6013f222b2ca2e028dc35'
-    oldFile: !uuid 'e30fffc60910ef4213c60a2369dedf73a1ccc01c'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '9aa683310ccfb8d0f37b3c44868f40edf50c2958'
-    oldFile: !uuid 'e35baac1d2fedfa1d874528d41712aced1c10fec'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java:
-    newFile: !uuid 'fd394a2c0faa1f774f2e60eaaf12b26d990f3934'
-    oldFile: !uuid '1579210064f352387d7279b9d333b2542eb28145'
-  /dolphinscheduler-dao:
-    newFile: !uuid 'c0aa7d391aaa8832f4e18d7328b9618f235e64e8'
-    oldFile: !uuid '9ed9d831115b86fef3a3310196cf2a73f51b8e42'
-  /dolphinscheduler-dao/src:
-    newFile: !uuid '111e7d0a15ddcb1f7c0034978e9fb65d4ecd4ed6'
-    oldFile: !uuid '55f8de5507a22804a5b20f00d211775e73f54c26'
-  /dolphinscheduler-dao/src/main:
-    newFile: !uuid 'e02a3e1ee42cdda031c4cfbdc166aae85a3ab417'
-    oldFile: !uuid '5e8b8e06caf9a69e43249c5f0b95732e59095a99'
-  /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid 'd43df75afd974020376cd7d3cb226eda83a419df'
-    oldFile: !uuid 'df0510163a36588475d404182e3df6fbe041e0f8'
-  /dolphinscheduler-dao/src/main/resources/sql:
-    newFile: !uuid '5666fd885100f00a0db6a286d15a978906df7de1'
-    oldFile: !uuid '945cce2bc49c3357f4fc69002fc30bdd895944a9'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql:
-    newFile: !uuid 'ae8b231b845a85d48fd66022afc2964feb7a71cd'
-    oldFile: !uuid '47bff2c0eff883ad499ee607d912c75c9d72a773'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql:
-    newFile: !uuid 'b024b25525312d3d11754ca6404b6ccc605f83de'
-    oldFile: !uuid 'c2b676fb5ceb85fd5655f4e8b4edeb934758c410'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql:
-    newFile: !uuid 'c03bdadbecbd266df74148e152d77734793b8985'
-    oldFile: !uuid '51f19fa8e97c8ce278a20d76c810eca47645272a'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade:
-    newFile: !uuid 'f5cfa44ab432820fcf2a6476f113ecac166c5bbb'
-    oldFile: !uuid '6601d98a550c21ee8ab17e70de27b832d52ac8b8'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema:
-    newFile: !uuid '5ff62a45fcb4bcbf1fa38c4ee66e41e280389c5c'
-    oldFile: !uuid 'f4b22c914aa8a089b53d6b87ea1833d0e5423fed'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql:
-    newFile: !uuid '2ffff363d76da80fc64315f9117a463c872a240b'
-    oldFile: !uuid '575abe47933145ec0fb8051ea3182d9300ca96c9'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql/dolphinscheduler_ddl.sql:
-    newFile: !uuid '6e084e244f5f1cb3085f81410fe2215c840f7552'
-    oldFile: !uuid 'db2ead4b767b3193e8a10e883ee84cce7bd12f01'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/postgresql:
-    newFile: !uuid '5188e5e3c8644c1384c8c5b14d2757112a010450'
-    oldFile: !uuid '6417fcffd3c66711ebb6b1ae7ab3348cd58457cc'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/postgresql/dolphinscheduler_ddl.sql:
-    newFile: !uuid 'e5aa5f0518b5a852b7db44465a98f61d80eea5d7'
-    oldFile: !uuid 'c677ae58b34bb40be056885d7daf00ad5171b9ee'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/postgresql/dolphinscheduler_dml.sql:
-    newFile: !uuid '4d7327f76791bf413cfc2a1e4a8ee8d08fe6d0b6'
-    oldFile: !uuid '4a14f326b985fdbdba5cb08b9d7822d5bc8d4225'
-gitCommitId: !uuid '82177840442d09bf012d3fd3f1e9665581cf4cdf'
+  /dolphinscheduler-master:
+    newFile: !uuid 'bfcb0593edb5f3ce68302259048cb2617870e0aa'
+    oldFile: !uuid '1927892d90331877998984a02155b1bdff4d4867'
+  /dolphinscheduler-master/src:
+    newFile: !uuid '5531f0ffd52e65f3a14da2103474e79169829ada'
+    oldFile: !uuid '32da41c2b7e805b6a5d08d9a8e13d506f2d57d68'
+  /dolphinscheduler-master/src/main:
+    newFile: !uuid '526a5a2fb6c43c9e175f7fc372aa389e8a8237e9'
+    oldFile: !uuid '36781a79bc53c56164e281bb8fd540817b4915d0'
+  /dolphinscheduler-master/src/main/java:
+    newFile: !uuid '3e6d4a14d75d604b539f22f57aa95d057cf0514f'
+    oldFile: !uuid '00191c89eeac2490c747af6f77238bba2faa73af'
+  /dolphinscheduler-master/src/main/java/org:
+    newFile: !uuid 'd9f0cc99082194a36a281505699fe4c09f81b01b'
+    oldFile: !uuid 'a433a3989a317a174d8ef7b2c31f49f361d6e581'
+  /dolphinscheduler-master/src/main/java/org/apache:
+    newFile: !uuid '2aab659a3b02823fee62f792d794903421be3240'
+    oldFile: !uuid 'd3518c65b003fc6b323971cb7d6192ceb09082c3'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '538bca0d8b9d44292ccd4693d5d1213a3abc6e28'
+    oldFile: !uuid 'a194eb40a2ba86ca4b57c54721713727bdf1a697'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
+    newFile: !uuid '8cdacc6f75d7d5b314321b00f714c39434e594e5'
+    oldFile: !uuid '109e12a136b722c524b7883398d79cb600121872'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
+    newFile: !uuid '9b04444336d8e9a220e58ed4ebfb307424b20d73'
+    oldFile: !uuid '5e6ab275a7ed026ab42e5d553fb1218114841a5b'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
+    newFile: !uuid 'd9eb264fc6ba8d5041e1618ba13920acbc994a42'
+    oldFile: !uuid 'd2d2b0797eb01b0865d29c7fe6d42afee40ca241'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task:
+    newFile: !uuid '47a94a9634b8e09b300c028f8fbc2dcccfb6bc45'
+    oldFile: !uuid '94efb694ac8b316b0d1a5a36db9a0f659c47c11c'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java:
+    newFile: !uuid '24b7fd0a7c2df766c2bbd153669af30c40e10392'
+    oldFile: !uuid '46e310f44c1548dab2c29d56074a153b6393a76a'
+gitCommitId: !uuid '496c2d4bfa9bcf72bd8c90a7732844b543c15610'
 renames: {
  }
-revisionId: 3334
+revisionId: 3335