#2675: [Fix][Master Server] handle warn+failed timeout strategy in workflow execute thread of master server (#8077) (#9485)

Co-authored-by: xudong.zhang <xudong.zhang@nio.com>

commit.ref

@@ -1 +1 @@
-Subproject commit b1d57dbce491d13d29ca44ebab776c49fa3656c7
+Subproject commit 508ed9769aebe70a87539eccb70b6a08d34e0183

commit.yml

@@ -2,124 +2,40 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
+  /dolphinscheduler-master:
-    newFile: !uuid '19f06d93c6b416eabebec480ae716c23774ec0f8'
+    newFile: !uuid 'aeea0366347ab175bdb76773d8eb73ceec9a48f9'
-    oldFile: !uuid 'bd7d9584d4ac7807e7d67124ea889056d5d20e37'
+    oldFile: !uuid '8f694a61aa00680704b500cc6d66b472b2403d45'
-  /dolphinscheduler-api/src:
+  /dolphinscheduler-master/src:
-    newFile: !uuid 'fe838c82151ad97c8ba0e3f8736d9558e33c4f62'
+    newFile: !uuid 'bffdbcbe7df053f046684bbcd326e82fbf845528'
-    oldFile: !uuid 'ce22d938e702692a6c4b542703e7d83db3324f2f'
+    oldFile: !uuid 'dc34dfaa717d4bf34c02d0498b1e0fc58e98d8da'
-  /dolphinscheduler-api/src/main:
+  /dolphinscheduler-master/src/main:
-    newFile: !uuid '3a0238d69f9d44fa943080f2dfb223079f237afb'
+    newFile: !uuid 'e86c9b5fc37842f421fc8fd16d6582b81a8f777f'
-    oldFile: !uuid '1a146d746801036af663ae7b38bf321828e9d53b'
+    oldFile: !uuid '3e7dd97e22d2df2019d6e9881495776dd2a04255'
-  /dolphinscheduler-api/src/main/java:
+  /dolphinscheduler-master/src/main/java:
-    newFile: !uuid '25f8c5e469f6b9ff071ed6c752612cb26dbdcfc7'
+    newFile: !uuid '3e9e763d98a6ebb2a7a0aa523d496b4461df84f0'
-    oldFile: !uuid 'a02020dab7316c62df13757982ee14632d66e377'
+    oldFile: !uuid '140822e3eff6373ee4bc3d9e78941e2cefc564d5'
-  /dolphinscheduler-api/src/main/java/org:
+  /dolphinscheduler-master/src/main/java/org:
-    newFile: !uuid '12321062f76291a967b0eaf1db59ff19aa034502'
+    newFile: !uuid '6b917e95ea99700f626b28dc0f904a2956945ad7'
-    oldFile: !uuid '844929bd9e868781f74cfd6944ad93515cac3dc0'
+    oldFile: !uuid '5a61c922b376cf43ff7cd3574ab0ad098bede3a2'
-  /dolphinscheduler-api/src/main/java/org/apache:
+  /dolphinscheduler-master/src/main/java/org/apache:
-    newFile: !uuid '1ba21449491cbf182b9a3096c7b770ee6eaac389'
+    newFile: !uuid '375008565b061b0466018ace0503f66870738b23'
-    oldFile: !uuid '477e1a9c8f3e8fbae4258a5f3bcbc2e41db2d446'
+    oldFile: !uuid '3e7cdd16224606444502aa31965508eda61cc21d'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '3d7b6ee03cfca86c8162354c3fd28dfdfbf57f77'
+    newFile: !uuid '6984283b48b956fd8616a4e40ad036b69a96dd9d'
-    oldFile: !uuid 'c01c224bbbc23a2510eb0700686336b77b9051c6'
+    oldFile: !uuid '5fc2f1e7e5818afb4c471c80346109cd38afc15e'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid '9f151f4331a3801662e1e9bef129045d48756187'
+    newFile: !uuid 'ee86f571193a7e58fe022f8e2a51ba04019dedbc'
-    oldFile: !uuid '351146d30052a6f6e8de1fcb5118cd3f5b0cb50f'
+    oldFile: !uuid 'a65c81335a867710220a78e1a40060608855aa7a'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
-    newFile: !uuid '625ff36ad53051858e879678ea60b711960fe3e4'
+    newFile: !uuid '05380ae5c75340c6903fd93579b8a8f611380755'
-    oldFile: !uuid 'a9f7c6d070ad7fa496ecf4d87c8a87457560c669'
+    oldFile: !uuid 'a1ad094883d71a521d72cfb9164a8eb3ed37cdf0'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
-    newFile: !uuid '4954adf4317d780c72d0e5345bd3bbd5bb853a50'
+    newFile: !uuid 'abc1e1f0a39754d98fe92d6f0887c5c991448371'
-    oldFile: !uuid '81802d5f9f6e225856f57a78359372d8c955192c'
+    oldFile: !uuid '135e9104cef6236e4be44040697b6daacef78015'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java:
-    newFile: !uuid 'b40c3ff937d2a26db13b0318b0b3cdff8eb5721d'
+    newFile: !uuid '8e20f92ead04b13387d1b64952d5694386a4cf5d'
-    oldFile: !uuid '1f8c29412b48b27222eb24f65e5fccc3266a5a43'
+    oldFile: !uuid '75a621bd43d74b2a17ac7e2a11011749538f08eb'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java:
+gitCommitId: !uuid '508ed9769aebe70a87539eccb70b6a08d34e0183'
-    newFile: !uuid '2c9fcff7a93a3a60514174b62f6a90a9746fb96e'
-    oldFile: !uuid '1087d595eb75a332b2138369867e2a3691cbf3bc'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'deee44fe59b3775d36348e62ff2418ce03ffedce'
-    oldFile: !uuid '73df3d361b8a51698440873782bd651fd237ac6d'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
-    newFile: !uuid '33cc6a2fbea54793ca9bc26c7d84550b5dcabc56'
-    oldFile: !uuid '44868243148f24cd46b66e147593dc36156414de'
-  /dolphinscheduler-api/src/test:
-    newFile: !uuid 'd501cf61f13021c2d9b4f7e5a80e0b5039717a95'
-    oldFile: !uuid '650cb9c0b7007b980a451e4f19c17bc00d497dc8'
-  /dolphinscheduler-api/src/test/java:
-    newFile: !uuid '3f6f7abe0a0649e2d405af16fc535a83fb9e243c'
-    oldFile: !uuid 'a6ee7418d3ffa634692eeb4c1b3710df90c77573'
-  /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid '93d4f810e497114d2e182220955b40484390f82d'
-    oldFile: !uuid 'a5a5db88148d4dd0efbcdc466b7b32cfd580fe01'
-  /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid '9e1dc37f2eabbe90db206ef0e4d1ec10d86d3479'
-    oldFile: !uuid '08e7fc5ec3e7289842bf95851f5337df812bdd90'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '37e8b12ca534d28c29471bb0a21ee5ed44270ad8'
-    oldFile: !uuid '82ec3c1789686854fb5e40008961345a1708df60'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '3c39357f368729d526f0ad89ba384285a8496906'
-    oldFile: !uuid 'd8434f56647ba0584b3e5238924bed5ac2d631d9'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '5c62dcb76766eaf6be6ed33d98a4742c5220bbff'
-    oldFile: !uuid '4857d48f1f10c6a5938c5a821104f38089b13a93'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java:
-    newFile: !uuid '3f2bd02575d6545aedfe3d12dd384095b1dcee98'
-    oldFile: !uuid 'cc6fc86e2516cc57c3a046558c60d8873d745508'
-  /dolphinscheduler-dao:
-    newFile: !uuid 'c589cfd8c2766f59ef853346e0f64608179f30a8'
-    oldFile: !uuid '10ff84868d5078634b0a83fe0d234f60d855c4f0'
-  /dolphinscheduler-dao/src:
-    newFile: !uuid 'eb43a46e6bd54a8dcdbb86341a87622f932abf4b'
-    oldFile: !uuid '5360c481eb3e8d45b470df97c04217d9f02637b1'
-  /dolphinscheduler-dao/src/main:
-    newFile: !uuid '7106f3baa56a51f91db66a6db8caebdb5fc5546a'
-    oldFile: !uuid '9479af830ba85d6aff820a3da7df56c75bac6ec3'
-  /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid '25456690a4f06bd652b23254e64983e34cdc406e'
-    oldFile: !uuid '6cb388e8ad9b34fb74497f306344e629bda26ef2'
-  /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid '9dcced97394c39f76f33557fc2920c222263cb3c'
-    oldFile: !uuid '87dcad0e8194c6b57644884d37494ea3d3b585d7'
-  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid '495a01b186f9826c0d9b3c0883a25aa7e2cbfe9c'
-    oldFile: !uuid 'a5a6c447ee8494c061c08489318a6f1e0e76612a'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '44df2428a7d4e6ec4abf262e22428267511d8310'
-    oldFile: !uuid '44aae7ee07d55017a52d90521e72c946693d3fd4'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid 'fcf1bc7f0a03b1727af1137272c9f67adaa426cb'
-    oldFile: !uuid '558b2824d344b5779e52136016856bb623ee1787'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid '4168a8c9497c6093b0072e283bb36ed01e63382c'
-    oldFile: !uuid '0a822bde03c122720a881d2620af68d18e220ec4'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.java:
-    newFile: !uuid 'c14f4b4db8737ffe2661fd20237dd7f2f2b4ba3e'
-    oldFile: !uuid '264c40e08029048b6dcf7da7918284f859ddb7b8'
-  /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid 'a2490238e2fcb707174f6639aac7289d03a0f4cb'
-    oldFile: !uuid '8869ccc2cd3ba4b45764a0dcae409d739ed0cfb3'
-  /dolphinscheduler-dao/src/main/resources/org:
-    newFile: !uuid '9f4cdaeaee31ba87c0c2e347422ab968a7a2bae4'
-    oldFile: !uuid '3159bb6d3aaf829313b8bcdcb54cfb36ad3adbfa'
-  /dolphinscheduler-dao/src/main/resources/org/apache:
-    newFile: !uuid '9ea23074f1221f888270e80452779d8bdadf03c4'
-    oldFile: !uuid '7f12489ca2c554c61021d5797f60298a250f42d1'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
-    newFile: !uuid 'e5ded487647b511d605c72f044c8ef4d93a16756'
-    oldFile: !uuid '9ea2ce5267bf113330fcb8cc2c2eeab583988392'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
-    newFile: !uuid 'f9739ea500e820d565f26373f2eacc722f2252ce'
-    oldFile: !uuid 'd5e51d658dd7b86956447009b394715e79a17d96'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'bcaf232880208950b840e62afbfa8a6edbb0e022'
-    oldFile: !uuid '614ee8b2ce2205cf1e1198785758f908d81c234e'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.xml:
-    newFile: !uuid 'e25fedefbb23f787569e55b127e7c59246f9fbfe'
-    oldFile: !uuid '4598ec0ead0620b8dfd6ce2719bf01ad93a1afe3'
-gitCommitId: !uuid 'b1d57dbce491d13d29ca44ebab776c49fa3656c7'
 renames: {
   }
-revisionId: 2674
+revisionId: 2675