#3393: [improvement] Add two parameters in workergroup, and support the application of description display and other parameters (#11542)

* [Improvement] Improvement default worker group * [Improvement] Improvement default worker group * [Improvement] Improvement default worker group * [Improvement] Improvement default worker group * [Improvement] Improvement default worker group * [improvement] The default worker grouping supports editing * [improvement] The default worker grouping supports editing * Update WorkerGroupServiceImpl.java * Update WorkerGroupServiceImpl.java * The default worker grouping supports editing * update sql file * update * update * update * update
2 years ago · d88a7ffa80
2 changed files with 192 additions and 60 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 4d13a5104b9a4ab16e16253ad2936107031e59e4
+Subproject commit abfef1a929b0b28f2e5bce4f52a571fe33a6fe86
--- a/commit.yml
+++ b/commit.yml
@ -2,73 +2,205 @@
 branches: {
  }
 fileChange:
+  /dolphinscheduler-api:
+    newFile: !uuid 'ebfbd65338ba98747303df44f603491761f85ec8'
+    oldFile: !uuid '767cd1e5745d9b92560548693f838f5560ef606d'
+  /dolphinscheduler-api/src:
+    newFile: !uuid '1449f8d24b745de24abdd60f961a8911375055aa'
+    oldFile: !uuid '7c9c8b9b8fa2e8e4fd5301f214dae74c1f7e8e63'
+  /dolphinscheduler-api/src/main:
+    newFile: !uuid '5304ed4854d781144f0f2a8a10b0bfe69c9ab2c7'
+    oldFile: !uuid '1de88ebe2fe0d4f605909c189773990e7659901c'
+  /dolphinscheduler-api/src/main/java:
+    newFile: !uuid '3b53b056f13f0e3c97ab69b065268b4b58c240ad'
+    oldFile: !uuid '75315e1413ace54aa318c5b6f1c92df1fc9da0c4'
+  /dolphinscheduler-api/src/main/java/org:
+    newFile: !uuid '07b50e0a2be7a3df2f77f0313f55e7041750cbec'
+    oldFile: !uuid 'ad45a748ded5acae270cbf66ba1a455206c9ba1c'
+  /dolphinscheduler-api/src/main/java/org/apache:
+    newFile: !uuid '5c4566e67d110f5cab614c7fd12b319e37176be0'
+    oldFile: !uuid '106d113f975bbb1346b9da3dcf00c9745e0a4706'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'e60f9906dd2b804b5e5ddaa0f02a1b2950695ba1'
+    oldFile: !uuid '802aae7ebf0c0ad413b5d76b6cb5bfb958101cf6'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid '380e7b0071be612223d8c2ad15bf898f5fc7a8ab'
+    oldFile: !uuid '78fe07250ea6a420c098ac506c66f0d964d481f6'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller:
+    newFile: !uuid 'eecd4d282715d027d35379122e564ca03c80b517'
+    oldFile: !uuid 'be31882869cda485e6751ecc94ffb1c346073789'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java:
+    newFile: !uuid '69e1a57d0f2f45b9b56ae0df47fa600a5c8e2200'
+    oldFile: !uuid 'ccb196eb6aaaa042ee0b10581737c517050ab30e'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+    newFile: !uuid 'da7dfb8921be4820a7f73bda020a7f12f1b11ee7'
+    oldFile: !uuid '5817bfbdfdde8c3bce844c37db0c40de30de7195'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java:
+    newFile: !uuid '4c474b75cda12bb26667bbe1a0cc0ade2ac64f98'
+    oldFile: !uuid '2de4134db51e8b942b7a22ed48a99c29d9b0dfc3'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+    newFile: !uuid 'b545fe7023e4d72bed92139aca472fd91dea8e10'
+    oldFile: !uuid 'cd23bfa2d5d18fa5979b59819cc28a360319c0e8'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java:
+    newFile: !uuid 'eee031942c489f3a99a3b046e77b0d2967a53f92'
+    oldFile: !uuid 'd5825491444fe03c72d6d5dad3d1f868d7b203f1'
+  /dolphinscheduler-api/src/test:
+    newFile: !uuid 'c4cdadcd718a2257f4ff9bedfde14f1d9c6a0230'
+    oldFile: !uuid 'd826be9f94754fc12e87e1a4b4de330ffca9b686'
+  /dolphinscheduler-api/src/test/java:
+    newFile: !uuid '15c051e002cd411778494cefcc1c3a58a91ec521'
+    oldFile: !uuid '9d5e2c650f4e15adb73fea32ec5db9ff79687f36'
+  /dolphinscheduler-api/src/test/java/org:
+    newFile: !uuid '7718ab29f6d6e72477c51e81fe1fb0232e8f6299'
+    oldFile: !uuid '2f2c5a11f917e1e8e89a0569c683a54dd809f6af'
+  /dolphinscheduler-api/src/test/java/org/apache:
+    newFile: !uuid '82460edd0acc5cd6db058ba41b990b6c60994d41'
+    oldFile: !uuid '872e32b2d1756cc5186cd347ef13bf172ce2c3fc'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '7f44bd9355130c3576d1038efe1455f5ddbc55ed'
+    oldFile: !uuid 'd7d0cb7c87fbf91f49e241382fd528b30cfe4776'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid 'b259b98f581e71dc1310de3c8c30b04252846f75'
+    oldFile: !uuid '58b27e622fae55444eb6013f222b2ca2e028dc35'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller:
+    newFile: !uuid 'baa181b799265014edefc064f3a111d26ce77376'
+    oldFile: !uuid 'd2d663705602af4e805b516efef4b15be92c16dd'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java:
+    newFile: !uuid '72bad1e686c0022c2b3f8144f0659a72de4d4213'
+    oldFile: !uuid '0f639d3fa7cddb1b3850caa4c37370382efd5fc2'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils:
+    newFile: !uuid '460c16880364933bc1cc93ae4aa9783a38ebcfef'
+    oldFile: !uuid '7399ad83e212d29dde61a2c9a016acbaa81c7765'
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ResultTest.java:
+    newFile: !uuid '6301a44468e436a3ce266b3d720200c4deda1846'
+    oldFile: !uuid '01fb75cdf7c00bc432ce2424290bdfecccd4e350'
+  /dolphinscheduler-dao:
+    newFile: !uuid '0bfd4e77322e10b437f225d44ae11301b05a8866'
+    oldFile: !uuid '9983552b2fa732a39e9acb51da81d1751f00f138'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid '6e203b35895605071010d8b7597d0c1a2dddc06b'
+    oldFile: !uuid '5e36ff7c19b4d04d6fd75f873b04f3749f40a364'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid '93f88ea647837cee95c683068d4ad3b12b9dbbfd'
+    oldFile: !uuid '4b7aade3614b486367e3edc9f25f3687149c7d7e'
+  /dolphinscheduler-dao/src/main/java:
+    newFile: !uuid '59f68899d49713f196882d986853da969825ee43'
+    oldFile: !uuid '6a25677b0c98c73ebd3c95ea682c12641a652848'
+  /dolphinscheduler-dao/src/main/java/org:
+    newFile: !uuid '975e8e5b2ee9690392a9193914f5b1b0a20634f6'
+    oldFile: !uuid 'ad2f982592e3760978ae1cd5c3b006db9d61deb4'
+  /dolphinscheduler-dao/src/main/java/org/apache:
+    newFile: !uuid 'c27b1185ab65f28e03c44774abb2216620d2dbee'
+    oldFile: !uuid 'a5c30dfb81919e90c1e86a8f8b4137e12aaa6da3'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'c576486db3f374f088368ed81b45387cd760fea6'
+    oldFile: !uuid 'e47ca87a006e7fe4e92d37a2b86dd32953fbf3f0'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid 'c75b369dd907e3e0b8494039a0557ef6402b324b'
+    oldFile: !uuid 'c1306f80c579fe92ae4e57f81c069be3cf833c9f'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+    newFile: !uuid 'fd7645821be3bb21277df7999fb33d935b05c4cc'
+    oldFile: !uuid 'b3bca905147ae5288893a39bea68dfedcdb3a4cf'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java:
+    newFile: !uuid '2fdd711549ba409b4ecabf8f417fd09765b3761c'
+    oldFile: !uuid 'cc19dd564961628bd5180e927d8aecffeffa009b'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid '7ff07d64ff6a6058044e8968acaf8fb060d450d4'
+    oldFile: !uuid 'd0c77434ce4846ffda2d2dfd8dde4d41df87b8ae'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.java:
+    newFile: !uuid 'fcff987d025f6b553bc0cf5ef616f007fcbd77fe'
+    oldFile: !uuid '36a57537b569f923b27af0017b74d03955b1c499'
+  /dolphinscheduler-dao/src/main/resources:
+    newFile: !uuid 'd96bdcdb87e9068cfdd467b286ebb43b6a2acbf1'
+    oldFile: !uuid 'eef93aa4eb0502977bdc0f9ce23def7d5a7807eb'
+  /dolphinscheduler-dao/src/main/resources/org:
+    newFile: !uuid 'dffc5534e9c29507890926df0b6366819ba97eb9'
+    oldFile: !uuid '9ce5e593ef2a9dcbac49c60efb159c40377e5e30'
+  /dolphinscheduler-dao/src/main/resources/org/apache:
+    newFile: !uuid 'db371166fc428021920a4d17476eec9dd6a4b02a'
+    oldFile: !uuid 'b54cb2bc3194e379c78414706622ee0f18b409ee'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
+    newFile: !uuid '135aa21b94093399d1fcb270e42f6ea90de50f09'
+    oldFile: !uuid 'c0c0fac9d713855d9f83038efb6268a7ba114279'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
+    newFile: !uuid '3fb89fb52a8ed173ee602feb0e83dfcbef4b8570'
+    oldFile: !uuid 'ea27f8d2c25f1eaa638028fe67ece93dc50488e1'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid 'be36412580f40a765599b64a3dd6449223f25973'
+    oldFile: !uuid 'dccda28a6b7e6bb0fdab710cdbbaefb699cd4168'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.xml:
+    newFile: !uuid '79305d1467256638d1e68bd1e0ed6ed50b128763'
+    oldFile: !uuid '2665f123cf29f23866cbd409948bfb5c91945602'
+  /dolphinscheduler-dao/src/main/resources/sql:
+    newFile: !uuid '98e62dca5d2162857336bb8432dd3d557c5b8302'
+    oldFile: !uuid '9f41789cd97297646e412eecccbd8307a55f1e4b'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql:
+    newFile: !uuid 'be90dda167bc175f8c2ec4da11993a6a1f40b405'
+    oldFile: !uuid '5211976ca09f48649930d421d8197c7cf54b85e1'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql:
+    newFile: !uuid 'c877fb6fef3bde725713162aa52fd8af65489b7c'
+    oldFile: !uuid 'ebddafc793587876fd47c93697a37ec5cc4656d9'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql:
+    newFile: !uuid 'f7cc1bf121d88b875bdbdd09c2c112e9ba741fbe'
+    oldFile: !uuid 'e4c0923bbb2732bd86631e0ecff684149e905f90'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade:
+    newFile: !uuid 'f95366a0fea95b722eba17b93e825075167f8460'
+    oldFile: !uuid '77319e18d3b2a669660c01575575cde82aad9172'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema:
+    newFile: !uuid '56b5aa1b514d566887cb606940a9ce28dd889764'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql:
+    newFile: !uuid '3cf118b6a397655d130d9ec81181765e098c5baa'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '3d0ad0197fe8eeae61cdb4a836eab48a95319ce4'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql/dolphinscheduler_dml.sql:
+    newFile: !uuid '4a14f326b985fdbdba5cb08b9d7822d5bc8d4225'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/postgresql:
+    newFile: !uuid 'd9670a8fd8d7dfef38ec6c8c941bc69627c50730'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/postgresql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '372b99be4ce26337f2ac371cf4f064481b618e35'
+    oldFile: null
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/postgresql/dolphinscheduler_dml.sql:
+    newFile: !uuid '4d7327f76791bf413cfc2a1e4a8ee8d08fe6d0b6'
+    oldFile: null
  /dolphinscheduler-master:
-    newFile: !uuid 'f7425096db60c08d87829cf9c653df53ea3443dd'
-    oldFile: !uuid 'c20c4074707b619f9959bb1c06ffa7839232bd0e'
+    newFile: !uuid 'cb74424af58a5299dc3b0b41eb8f881f25e9ce53'
+    oldFile: !uuid 'f7425096db60c08d87829cf9c653df53ea3443dd'
  /dolphinscheduler-master/src:
-    newFile: !uuid 'bd19f77b5aaf78030fdea79ae9d13f074f5fd4dc'
-    oldFile: !uuid '0a92c6fbff4171644ba44a65babd3a51677659bf'
+    newFile: !uuid '8a1bede4f042a03e480d1f3d123f884c152889ac'
+    oldFile: !uuid 'bd19f77b5aaf78030fdea79ae9d13f074f5fd4dc'
  /dolphinscheduler-master/src/main:
-    newFile: !uuid 'bdc675605e66140a468078a4b45199b965b10c52'
-    oldFile: !uuid 'edbb4d00ba5aff06c78a3bea6ecdcbfe311e6680'
+    newFile: !uuid '8e3b01c0281ec2011a118ccfd1a56399c6150013'
+    oldFile: !uuid 'bdc675605e66140a468078a4b45199b965b10c52'
  /dolphinscheduler-master/src/main/java:
-    newFile: !uuid '78468121991011a834df26c617e35fc922cde94b'
-    oldFile: !uuid 'f2425e4612e14d6581370eafbe7f567b0dd14ba7'
+    newFile: !uuid 'f5fcb76b5e890886e4c025ac1106245e7f92a6d5'
+    oldFile: !uuid '78468121991011a834df26c617e35fc922cde94b'
  /dolphinscheduler-master/src/main/java/org:
-    newFile: !uuid 'ea3077df4202e1b474d0a3abb345927cd1412820'
-    oldFile: !uuid 'd331826c9c42018a289b28eeee63f80c70cb6cc5'
+    newFile: !uuid '67683cba0c354fb70bb29f79cc1aa09b2f586b8a'
+    oldFile: !uuid 'ea3077df4202e1b474d0a3abb345927cd1412820'
  /dolphinscheduler-master/src/main/java/org/apache:
-    newFile: !uuid '8aed551d2c49ca85563ad7875ca4297216bae6ef'
-    oldFile: !uuid '4299c276c73b0f6c6cb5903716dc8c414ff063ff'
+    newFile: !uuid 'f823d79c2cb9b40ba5839135a0564d2ef1fda423'
+    oldFile: !uuid '8aed551d2c49ca85563ad7875ca4297216bae6ef'
  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '4c4cd19ecccf597ab9a33025900ab02c89e9f000'
-    oldFile: !uuid '80f2b3b2bdd24667782a7a47b8d57d15181aaa02'
+    newFile: !uuid '852f1f563d5892ce69dbbe7ff7a1b3c6c0d7a1e3'
+    oldFile: !uuid '4c4cd19ecccf597ab9a33025900ab02c89e9f000'
  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid 'c885dd71bb5ed085d56b394995a08a787b2eb2d6'
-    oldFile: !uuid '702b25495c0c6ec0c37a2eae5f0abb32a94f9ab9'
+    newFile: !uuid '9b33c2ed498e21c6ce8f9ab892c185ae0a2ce7a7'
+    oldFile: !uuid 'c885dd71bb5ed085d56b394995a08a787b2eb2d6'
  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
-    newFile: !uuid '0b78217a0a76322f93182491d5b3beb5dfa7c4cd'
-    oldFile: !uuid 'cb04804834534ba764ed140201edb90c0907d94c'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
-    newFile: !uuid 'c4ab749731a66ed5199c44f2c288cb51d8cf2ba9'
-    oldFile: !uuid '59dc00cb47cf6d487015a65ca98ee2c15f3c568d'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task:
-    newFile: !uuid '3eb9d32a34795c375e9cae433a43481d4e668576'
-    oldFile: !uuid '7911678753c22bfd6a3f54bcf5650da799163f0d'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java:
-    newFile: !uuid 'e5413c14908cfae026b874c905ce868ec89fe23b'
-    oldFile: !uuid '24b7fd0a7c2df766c2bbd153669af30c40e10392'
-  /dolphinscheduler-service:
-    newFile: !uuid '70256bca1e782c8b8298cdbc9b7d8fd2dfea30bf'
-    oldFile: !uuid '536c659e912b575bc407b1afd4c5c704ee8b3cb7'
-  /dolphinscheduler-service/src:
-    newFile: !uuid 'b2a94c74e5c747afc429f6bed5e3a76577ce4764'
-    oldFile: !uuid 'c6cff6a36f456bd8234eacf47ec700e647a6a942'
-  /dolphinscheduler-service/src/main:
-    newFile: !uuid '5f0c400adeca70e0a7f3ae532b708e193336bf1a'
-    oldFile: !uuid '868bed4beae240d676d98e6042434679a701f5b3'
-  /dolphinscheduler-service/src/main/java:
-    newFile: !uuid '2c4019317c5d447eacd4c6e37223435a2edc37c1'
-    oldFile: !uuid '35ff2a7932a2454758595d1386a47e3f140f3edb'
-  /dolphinscheduler-service/src/main/java/org:
-    newFile: !uuid 'c8c88e0259659034533acd76edda26f750de2d17'
-    oldFile: !uuid '38690ee001675c24839487cc38bf2e611ce099e2'
-  /dolphinscheduler-service/src/main/java/org/apache:
-    newFile: !uuid '9703caa3f55495fcab4f3fb8ff3cc0c829631909'
-    oldFile: !uuid 'cb12fa2423d34e35d2f43402de8bcc1d6d2ce3aa'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '17c20ebc20ea045d8822d3de2a6028e283f7ad1e'
-    oldFile: !uuid '821dc20b87b1f7e246c3e66786ebd06171dd950d'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
-    newFile: !uuid '88fa3b1e8e2c7c450915adaf8c67d50210cc051d'
-    oldFile: !uuid 'b0841238cd09a06bad65636a3e983bc86119175f'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process:
-    newFile: !uuid '5e61e35d6409b5242f892f5b8d9aec38680c557e'
-    oldFile: !uuid '685d671cbd16601ba4debe33d175d16852b061fd'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
-    newFile: !uuid '130e9f1ae9c129508386d254946d58344ef6970e'
-    oldFile: !uuid 'b4faf51168faf265fbbaa21795783f34c13177b8'
-gitCommitId: !uuid '4d13a5104b9a4ab16e16253ad2936107031e59e4'
+    newFile: !uuid '9d81ef7489349b210fda409297b428970054a8a3'
+    oldFile: !uuid '0b78217a0a76322f93182491d5b3beb5dfa7c4cd'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry:
+    newFile: !uuid '1fe7ef65535e7c019820e0160691cc8ea29a1ba3'
+    oldFile: !uuid 'e410fa6d4d4860beb56dbef7ee11f6e10dc9f817'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/ServerNodeManager.java:
+    newFile: !uuid '58df904fc51b045647a0431a9045cf0003fcb577'
+    oldFile: !uuid 'b92cb6147361c187fc42de79babfdab6394838bc'
+gitCommitId: !uuid 'abfef1a929b0b28f2e5bce4f52a571fe33a6fe86'
 renames: {
  }
-revisionId: 3392
+revisionId: 3393