#3295: Fix TaskGroup cannot work and will cause master dead loop (#11254)

* Fix TaskGroup cannot work and will cause master dead loop

* Remove acquireTaskGroupAgain in ProcessServiceImpl

commit.ref

@@ -1 +1 @@
-Subproject commit aef2fbf36c76d4dbfcf566ec959acea00e7bec4e
+Subproject commit acd3d3fab14d08b3b06015be3ac9cfb2f4bfc934

commit.yml

@@ -2,115 +2,124 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '041b62aa37ab15c90a0e496bcca7bd372ee3acd6'
-    oldFile: !uuid '2d778c9c4ee6ff5aa466f8ac3d1ed1a8550bbea8'
-  /dolphinscheduler-api/src:
-    newFile: !uuid 'f36c5b57a643075a40f22ea94b14391641bb6eb3'
-    oldFile: !uuid '43ea4c5d7d145716fd289149a81528564783a1fc'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'ffeac14d3b17787785ca6ae6e8d3b4cee90ea0a9'
-    oldFile: !uuid '161fbad17457ada5b6b3287ebabb5393f70ce4a0'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid 'f1bc53fc903c7c311bd4e7f721014ab409cc92fe'
-    oldFile: !uuid '7a8831b4d1c71cc7b499aa26fc630fccc374af0d'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid 'c36e3e81bda78be4ad579e15776140650e4fcf0c'
-    oldFile: !uuid 'f5d3263cfa5e6032d40b33c54490a9731017b580'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '2292471caee45d5603bc2b440ada97c43bba3bbf'
-    oldFile: !uuid 'b3138e35d671aa4ce9c74849e2bd8a39112a0f9a'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '7718de0bd50bef941cc6c36676beb3aa99f9231b'
-    oldFile: !uuid '91c5f2635a1182e21644c3f2dff14068a2ac6fed'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '8467569470d4ad395b90dba6edac22a9e036827f'
-    oldFile: !uuid 'e74062d1f8aaca2ca4f94928471db4314273bb09'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python:
-    newFile: !uuid 'd4ee64c9839580bbb47972d3bf0fe74f56028969'
-    oldFile: !uuid 'bd6d986224a463ec3605179cd25617a64c977d6c'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java:
-    newFile: !uuid 'd0489cce62c71f3f4a269b41f27d49d5fd117791'
-    oldFile: !uuid '57e289137ae9d46a7ee2e2693bfa21dc6453956d'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '85b5d0891084c47c7782d8c504de12ad36c95db4'
-    oldFile: !uuid 'ce53788eca1d91e5e305e11d71cb97fe2c96479b'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java:
-    newFile: !uuid '00c6fa151b7e8048b1d8a2d22f03bb2f50593d95'
-    oldFile: !uuid 'fb0fee5e17021980b815891c1fc9e3e86a7bbf96'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid '3b691c0afca823e78de3d86a1d45266984a08086'
-    oldFile: !uuid '884221d991a483c475d4e82d3fedab9a80d571a2'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java:
-    newFile: !uuid '16e230a705b9248e5e7fecfe8a10c89d814169ee'
-    oldFile: !uuid '55fd2f275f574ffaa40be000a7ce73ae75494e32'
-  /dolphinscheduler-api/src/test:
-    newFile: !uuid 'b6e69d5caeb3ffb1796c27a0649ae2ca2313be38'
-    oldFile: !uuid 'a0321f4c3119fa4e24d110101feae946b0b8f9d6'
-  /dolphinscheduler-api/src/test/java:
-    newFile: !uuid 'e4e1eb9184d793b81bffe41c7b1b7761f79e6a09'
-    oldFile: !uuid '3815d6d9af7573a3e418eeae9b50460fc0c854b9'
-  /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid '9bd5fd2d6f558d7478987655a55fda634efaddf4'
-    oldFile: !uuid '0a781f3d6ffaf38d9f918f26c351be423b137ed6'
-  /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid '8bd54856e90f7f38a3bc2b169451b10bebeadb3f'
-    oldFile: !uuid 'b2fc2610d228cffc81a9617396d0cea8354524bf'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '69c7935e17c11e25535eaadb597427e55d433600'
-    oldFile: !uuid '7be6e443f3be44682def0ccf18b6c0016d6d2713'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '25f3a6912d691f790f8068453a9a6a3302a47f2a'
-    oldFile: !uuid '1bb96f0698cbfe996c72e9e831465d7e99cafbf3'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/python:
-    newFile: !uuid 'abc189515a7c4b4d381695a93ca57fb2914cd646'
-    oldFile: !uuid '1864127b51aca39c24449baad98733d50322b4cf'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/python/PythonGatewayTest.java:
-    newFile: !uuid '2a49ed307b3de74a75e33bdea8c59a84559bd370'
-    oldFile: !uuid '022eb344a5fabf8eed121a34e5fbbf7f6bb4c578'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'ecef65ed108248d6f26c7da304a0dd4df5d539c5'
-    oldFile: !uuid 'f799e6b772fe35f19983beb9d81e2f725d550feb'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java:
-    newFile: !uuid '1579210064f352387d7279b9d333b2542eb28145'
-    oldFile: !uuid '961d5f776349b242dd73c8536e6a681d0d983ee8'
-  /dolphinscheduler-python:
-    newFile: !uuid '30ca4ecfeb7b640f2689f8d4acadcce1a84cbffd'
-    oldFile: !uuid 'a5174190590bf0dfef81242efe553d2a32c99ab8'
-  /dolphinscheduler-python/pydolphinscheduler:
-    newFile: !uuid 'f3669c90738feefd7c31936ec35a3e5440f8f120'
-    oldFile: !uuid '3d835596d7736d5b3c1810b8e7c3f76b9d20328a'
-  /dolphinscheduler-python/pydolphinscheduler/src:
-    newFile: !uuid 'cf99f381bc6b02fa89020b6f26fc9b98db0d2c23'
-    oldFile: !uuid 'e66e9bf5ff956d3c306097eb16dd71591de06268'
-  /dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler:
-    newFile: !uuid '88e902add794dacd981abbc47779f852ecfd7c23'
-    oldFile: !uuid 'db2c62accf33164d110df15f9af0ad665793a601'
-  /dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core:
-    newFile: !uuid '20c9f2a9c0aad57c60472aba90c0445fec1eafa2'
-    oldFile: !uuid '85394316ede2c167f4fb72d84eac6fdc7707251d'
-  /dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/process_definition.py:
-    newFile: !uuid '1740beafdfd08d022f640a36556596e9d0747164'
-    oldFile: !uuid '31d1e6124b3d42b81496afb7c2e25abd39af8a8c'
-  /dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/resource.py:
-    newFile: !uuid '8015a72e39b314961e32a9316f79d11c099b7b05'
-    oldFile: !uuid 'a3aab81d170a61752211a19aec8da85d548b52c0'
-  /dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/task.py:
-    newFile: !uuid 'b866ea221f660bca8cbff5d3a454ab7845a8411d'
-    oldFile: !uuid '4d4e67e3235352cbdf0ae1869edc535359c93624'
-  /dolphinscheduler-python/pydolphinscheduler/tests:
-    newFile: !uuid 'c2dd6195a200e1b2c885b411546736c5794c87dc'
-    oldFile: !uuid '90c157c8725e504a31ed436ebca11b1c553e6fcd'
-  /dolphinscheduler-python/pydolphinscheduler/tests/core:
-    newFile: !uuid 'd8f7d2eadeb08a9a47d90693141b18c54d603e80'
-    oldFile: !uuid 'baa3e22899738175abb9aeb2bb5d1f6862c629ac'
-  /dolphinscheduler-python/pydolphinscheduler/tests/core/test_resource_definition.py:
-    newFile: !uuid '07fcac3547e39171856ceb442914ef5b50a48806'
-    oldFile: !uuid 'ebfb8936f8eafd16a842ed0f67138016d15bcafa'
-  /dolphinscheduler-python/pydolphinscheduler/tests/core/test_task.py:
-    newFile: !uuid '201bdb30cde592fdd93afc72f185ce6c620297bd'
-    oldFile: !uuid '65555c1eb5429a7a19583831e3fd07a55a9bc30e'
-gitCommitId: !uuid 'aef2fbf36c76d4dbfcf566ec959acea00e7bec4e'
+  /dolphinscheduler-dao:
+    newFile: !uuid '5a06f8f0c0246d13d03b4840d1f673db9f0cc5f2'
+    oldFile: !uuid '6d2c6225f03e2d2205515dc860a3f68b25177b58'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid 'fe9785c0542b717343506df280b84e3b8969e2d8'
+    oldFile: !uuid '0c1a8dc9a7ee38c0f214602e1e2fb5f891e6e8f3'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid '158bcd964dd17e73b2c3d91d5faaac2deaa84eb8'
+    oldFile: !uuid 'a822e56ce7c790fb8d43e173c87aa7704e544c60'
+  /dolphinscheduler-dao/src/main/java:
+    newFile: !uuid 'b02075115a7136bd82678e3788a557c1ec64a0ab'
+    oldFile: !uuid 'f4c5626809ba0f67aa0f34f54706aa9f7f87b298'
+  /dolphinscheduler-dao/src/main/java/org:
+    newFile: !uuid 'd6d843b66678d111da0833836cf14e2ece2bf495'
+    oldFile: !uuid '5779f5e1b3d52e9dc93097db2711c00c2efe8b52'
+  /dolphinscheduler-dao/src/main/java/org/apache:
+    newFile: !uuid '36b0beb44cef2205a25f33f2e7d68ffccde0a923'
+    oldFile: !uuid 'b9594efe2cd14dd029f155692053041d28f9746f'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '5003ed0dd0a20f891075d4f25bf10eda1b24571b'
+    oldFile: !uuid 'bd4f4a5cbb3014baddb0f8c146f771e3ea4ad345'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid '30fcfae21f2413acbce9be5d88ac11ccf26ce3c1'
+    oldFile: !uuid 'b651ad692d0f249ac0932356894a4408f6fe83e2'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+    newFile: !uuid '0e3687bbd4901abab1a621964a76c34abbedb60e'
+    oldFile: !uuid '604d16529795bd9d7f7455f7a7c3d0ae6997a683'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskGroupQueue.java:
+    newFile: !uuid 'b9959eb96e84e107d8ab892a94f3c43a05b3faf9'
+    oldFile: !uuid '6399f12ada51a02b34f767f40ce6fb732810157f'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid '226d08bf3779b75b4647e98ac6951ff9e4b882f2'
+    oldFile: !uuid 'f4e840dc9cc06350d3ebabdb5b8d7cb8367794be'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapper.java:
+    newFile: !uuid '05c99194ce65487910909e7a2d0f2d08d2d5d671'
+    oldFile: !uuid 'a2c9359e18b1f0d4dd9675ffd0ced70baba9e911'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapper.java:
+    newFile: !uuid '38f5ca60166d567049c7c77fee1faadab0b048a0'
+    oldFile: !uuid '5fda409432478dab9488165c22eded3044af1674'
+  /dolphinscheduler-master:
+    newFile: !uuid '92155f43d7974d06208d91bf5bc237748f081f92'
+    oldFile: !uuid '659f26c65c93bd44ef4a07424c445f7443f8ecba'
+  /dolphinscheduler-master/src:
+    newFile: !uuid '5ebd2eb365c0d387f1f8b3ac71e5b2fa5faf5741'
+    oldFile: !uuid 'd20a844b8e71ff27d1dd217afc402b48e0e206cd'
+  /dolphinscheduler-master/src/main:
+    newFile: !uuid 'e235e9fec11a14ab05607c02fa8b098fb90e7661'
+    oldFile: !uuid '3055c8f8528da4f15f851ad51f694ce6032e4005'
+  /dolphinscheduler-master/src/main/java:
+    newFile: !uuid 'eb26d6c2fb89df9a90f648d1318a4bf11c9bc0eb'
+    oldFile: !uuid '5a09873ce56e6fab231d1b7934f17324e5094679'
+  /dolphinscheduler-master/src/main/java/org:
+    newFile: !uuid '924e71dfb88285bcd8049ca5829919783874576d'
+    oldFile: !uuid '74ba39dc21979b1c077a050a88ffb37a99b484a8'
+  /dolphinscheduler-master/src/main/java/org/apache:
+    newFile: !uuid '75ced733ca10cf8818be25b64a88b4f5d785d7ec'
+    oldFile: !uuid '03b26682f12d4ec97a6b4553f864eb7eb5ffe59b'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'bc189dfd060666940d962e5f74507c49d0041131'
+    oldFile: !uuid 'fae513135bf1e7c64c7083c05a6967c4d86a8b01'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
+    newFile: !uuid 'ce36f94c2566ca2ebf1432165fbad338302a4fe4'
+    oldFile: !uuid 'cec009364c2484510d23d3c529682975e70063e1'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
+    newFile: !uuid '911cb6791480b2aaf372347e664be775db3d5713'
+    oldFile: !uuid 'e2f2ff41296f4ab8fd088b5be6ee5c526464781b'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event:
+    newFile: !uuid '52cb605e6b75e5ef13e1715a69bfe19ef6295a61'
+    oldFile: !uuid '2338aac4f4e9704a27ec3164c90b9ef7c2e06533'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java:
+    newFile: !uuid '9854f9560595fa7fc776d0ac0862e9419d71b693'
+    oldFile: !uuid 'c0cf864d31cabf5ecfe6f1a0993e231fc1f324da'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
+    newFile: !uuid 'ff96d9bec96f313716d9d116160dc0a0286c17a8'
+    oldFile: !uuid '7825c2b80ffe24956e0ef10f1f64a8ab6fa515a0'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
+    newFile: !uuid '22e79daa6d4954e17b194ec1a1097ac4e96617ac'
+    oldFile: !uuid '7f98e074536b460cce35a7a050e6ce6982394c55'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task:
+    newFile: !uuid 'e0f82767d787cca0ab6e187b52af2b39146a7b8f'
+    oldFile: !uuid 'adee1846195baf7ebe7475fdce3dc64615c163e5'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java:
+    newFile: !uuid 'f8cf041ae6606a77a54a66d44743baba01fe845d'
+    oldFile: !uuid '06a72d1c882090fc7e8e3841f363622c8abb7a6d'
+  /dolphinscheduler-service:
+    newFile: !uuid '9a2b36b00bea866dc324bc007920fb3aafd56ed8'
+    oldFile: !uuid 'f03711ed46c40511b04845505947e7fbf30b5a5a'
+  /dolphinscheduler-service/src:
+    newFile: !uuid 'af5a2d58b359bb6911f11823fa41ea14f7ce3c43'
+    oldFile: !uuid 'df4325f84f515193c305f3916be719941f48cf93'
+  /dolphinscheduler-service/src/main:
+    newFile: !uuid '9894af0e201ebcb2c403629fb1dda202cb54bf39'
+    oldFile: !uuid '95634a793a3364e6f136db2fb1470bf4b3cf3725'
+  /dolphinscheduler-service/src/main/java:
+    newFile: !uuid '8066eba0a85d354586445fd939b105a1b050bb0c'
+    oldFile: !uuid 'f48f40543b88f75dee913d27ce38b383a1f06ad7'
+  /dolphinscheduler-service/src/main/java/org:
+    newFile: !uuid 'a1e86fe1fb652c428e4a1eca6599b4072298f867'
+    oldFile: !uuid '83cb0ceb457f24da6eea72c9394fd416108bbce3'
+  /dolphinscheduler-service/src/main/java/org/apache:
+    newFile: !uuid 'c5e50d93e24f480f0a60c108af41c3c1dce895de'
+    oldFile: !uuid '04e3575a640e3586bfa37fa995d65b3f2d60a090'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '0f13dd0c0e03d9bd28c19575867fccad16809185'
+    oldFile: !uuid '8868bd87d5522492d8a62a5d336b924f5a1ff044'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
+    newFile: !uuid '88d122c4d275a83ac5df877a8556b3e7d5ced7ca'
+    oldFile: !uuid '821b3a72c0ff66f6b5824a8705daef3ae43ccef6'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process:
+    newFile: !uuid '720440c63d8c22822252a1fa249dfb12025bc456'
+    oldFile: !uuid '2b9d4efd3820c93e77040e8f73f20f63bf063359'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java:
+    newFile: !uuid '6c1cf5f962194981dfc1b23111444a6ffbf8e54e'
+    oldFile: !uuid '976fd909862c7dbf1f7970347624a2939f5521d3'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
+    newFile: !uuid '1d8628a8c08c1db9625ffa6717394a6b129bda0e'
+    oldFile: !uuid '7dc4ce7bed39aacc249c08e94fa0749233d58a6b'
+gitCommitId: !uuid 'acd3d3fab14d08b3b06015be3ac9cfb2f4bfc934'
 renames: {
   }
-revisionId: 3294
+revisionId: 3295