Tree: 3aa34bc723

2.0.7-release

2.0.8-release

2.0.9-release

3.0.0-release

3.0.0/version-upgrade

3.0.1-release

3.0.2-release

3.0.3-release

3.0.4-release

3.0.5-release

3.0.6-release

3.1.0-release

3.1.1-release

3.1.2-release

3.1.3-release

3.1.4-release

3.1.5-release

3.1.6-release

3.1.7-release

3.1.8-release

3.1.9-release

3.2.0-release

3.2.1-prepare

3.2.1-release

3.2.2-prepare

3.2.2-release

3.2.2-release-bak

dev

dev_wenjun_refactorMaster

upstream-dev

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.1.0

1.1.0-preview

1.2.0

1.2.1

1.3.0

1.3.1

1.3.2

1.3.3

1.3.4

1.3.5

1.3.6

1.3.8

1.3.9

2.0.0

2.0.0-alpha

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.0.6

2.0.7

2.0.8

2.0.9

3.0.0

3.0.0-alpha

3.0.0-beta-1

3.0.0-beta-2

3.0.1

3.0.2

3.0.3

3.0.4

3.0.5

3.0.6

3.1.0

3.1.1

3.1.2

3.1.3

3.1.4

3.1.5

3.1.6

3.1.7

3.1.8

3.1.9

3.2.0

3.2.1

3.2.2

test

v2.3.3

v2.3.4.202211081355

v2.3.4.202211091515

vdev-20220412-1028

vdev-20220414-1341

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3aa34bc723'

${ noResults }

Commit Graph

66 Commits (3aa34bc72363eab368ade91b6e5be77b67897b02)

Author	SHA1	Message	Date
bao liang	657ea4752f	merge from 1.3.1-release (#3161) ... * merge from 1.3.1-release * [bugfix] remove Conflicting configuration sudo and user (#3038) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * remove some standard notices in order to cut down the NOTICE file. (#3101) * #3084 remove some standard notices in order to cut down the NOTICE file. * update exclude element sql/soft_version of rat plugin * update soft_version * merge from 1.3.1-release * fix 3112:download udf resource need find the tenant code of resource owner (#3114) * fix 3112:download udf resource need find the tenant code of resource owner * fix 2975:download resource need find the tenant code of resource owner * remove useless code * merge from 1.3.1-release * remove some notes (#3127) Co-authored-by: lenboo <baoliang@analysys.com.cn> * fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128) * fix Permission denied if not found dolphinscheder-env.sh * update some comments on method * add PropertyPlaceholderHelper on license (#3129) * update license header location * add PropertyPlaceholderHelper on license * merge from 1.3.1-release * change from 1.3.0 to 1.3.2 * add Set import Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com> Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: lenboo <baoliang@analysys.com.cn>	4 years ago
qiaozhanwei	1eb8fb6db3	NettyDecoder class decode method switch case remove break (#3035)	4 years ago
tswstarplanet	bf3cc0d00e	[Bug][Refactor][issue-3157]use cas to avoid thread safe problem (#3158) ... Co-authored-by: lgcareer <18610854716@163.com>	4 years ago
bao liang	5bac559d22	Revert "branch dev merge from dev-1.3.0 (#3087)" (#3094) ... This reverts commit ab6e4310b4. Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
dailidong	ab6e4310b4	branch dev merge from dev-1.3.0 (#3087) ... * add DolphinScheduler slack channel * Update README.md Co-Authored-By: Jiajie Zhong <zhongjiajie955@hotmail.com> * modify soft_version 1.2.2 to 1.3.0 * Repair worklist cannot be deleted * update schema version (#2657) * change schema version from 1.2.2 to 1.3.0 * change version value of table t_ds_version from 2.0.0 to 1.3.0 * fix bug: sub worker flow in complement data would run start date (#2581) (#2656) Co-authored-by: baoliang <baoliang@analysys.com.cn> * Fix conditions node save exception * add unique key for t_ds_process_definition * add unique key for t_ds_process_definition * script variable has "processDefinitionId" is error #2664 (#2666) Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * update filename * Update dolphinscheduler_ddl.sql * Delete dolphinscheduler_ddl.sql * Delete dolphinscheduler_ddl.sql * add unique key for t_ds_process_definition add unique key for t_ds_process_definition * add unique key for t_ds_process_definition add unique key for t_ds_process_definition * Modify the alert log file   * blank in eamil and left font align #2648 (#2673) * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * fix zookeeper health check and merge volumes into logs volume (#2674) * fix zookeeper health check and merge volumes into logs volume 1. Fix zookeeper health check 2. Merge volumes into logs volume 3. Modify `dockerfile/hooks/build` script * Modify ci_e2e and docker image registry * Modify ci_e2e * Modify ci_e2e * Modify ci_e2e and move ./dockerfile/hooks/check to ./docker/docker-swarm/ * migrate docker composer and move dockerfile dir to docker/build * ut docker * alter dockerfile to docker/build dir * delete docker-compose old * delete dockerfile zk * delete dockerfile zk * delete dockerfile zk * [bug fix] some bugs from 1.2.0 to 1.3.0 (#2676) * fix bug: some bugs about worker group from 1.2.0 to 1.3.0 * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix ut bug Co-authored-by: baoliang <baoliang@analysys.com.cn> * add worker group config (#2681) * update README about DolphinScheduler * Update issue templates * update * regularize api pom xml update rpc maven compile to 1.8 * regularize api pom xml * change commons.lang3.StringUtils to common.utils.StringUtils * update pom.xml * update * correct equals method * jasper-runtime is needed when api server start * jasper-runtime jar is needed when api server start * combine logback config of master/worker/alert/api server to one logback.xml * remove tomcat runtime jar * add UT * add license * remove jasper-runtime jar, not need anymore * sovle jar conflict， remove servlet-api 2.5 jar * remove servlet 2.5 * add embedded database h2 and update embedded zookeeper * delete logs * add license * change log level to INFO * simplify and optimize config * add development state * simplify common config * add worker group config * add worker group config Co-authored-by: lidongdai <escheduler@outlook.com> Co-authored-by: dailidong <dolphinschedule@gmail.com> * delete log files while deleting process instances #2463 (#2693) * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Update dolphinscheduler_ddl.sql * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml (#2692) * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml 1. add initdb volume for pg service in docker-compose.yml 2. modify ci_ut.yml * add sudo in ci_ut.yml * Query the metadata of indexes is not correct in postgresql/dolphinscheduler_ddl.sql 1. replace information_schema.STATISTICS to pg_stat_all_indexes 2. modify ProcessDefinitionMapperTest.java * Remove inner zk and pg * add inner pg * conditions The task node adds a background color to distinguish successful and failed connections * add LoggerServerTest UT (#2713) * add LoggerServerTest UT * add LoggerServerTest UT Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * add UT (#2717) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * fix worker group config no effect (#2719) * Conditional judgment adds text * fix * fix #2449:It's should successful to cancel authorize a resource of a user if all the online process definitions created by this user didn't use this resource. (#2725) * Underline the list of workflow operations * Modify HDFS/S3 path (#2736) * Modify HDFS/S3 path   * Modify HDFS/S3 path   * Update common.properties Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: dailidong <dailidong66@gmail.com> * Modify ip configuration * set worker group (#2743) * simple config * fix worker group config no effect * fix #2598::allow to update resource suffix,but if it is authorized to other users,it is not allowed (#2732) * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed. * add RESOURCE_IS_AUTHORIZED status * verify whether the suffix is empty * remove extra variables * fix code smell * Update known-dependencies.txt * update worker group config (#2746) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * Update datasource.properties * remove codehaus janino jar (#2742) the license about janino maybe not compatiable with Apache v2 * [bug fix] fix bug:2634:Process shows success,when the task of the process is killed in the terminal (#2731) * fix bug: some bugs about worker group from 1.2.0 to 1.3.0 * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix ut bug * fix bug: Process shows success,when the task of the process is killed in the termina * fix bug #2634: Process shows success,when the task of the process is killed in the terminal Co-authored-by: baoliang <baoliang@analysys.com.cn> * Update known-dependencies.txt (#2748) * fix getWorkers bug on RunConfig (#2747) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * master select worker filter high load worker #2704 (#2733) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Fix rename check parameter * fix * fix 2598:change getId to getUserId (#2757) * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed. * add RESOURCE_IS_AUTHORIZED status * verify whether the suffix is empty * remove extra variables * fix code smell * change getId to getUserId * Fix MySQL autoDeserialize bug (#2728) * Fix MySQL autoDeserialize bug * add MySQLDataSourceTest * Fix workflow definition history node data cannot be opened * fix * delete normalize * update e2e chrome version (#2775) Co-authored-by: chenxingchun <438044805@qq.com> * Modify the background color of conditions task node connection * [BUF FIX]fix: the master would be blocked when worker group not exists (#2764) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut Co-authored-by: baoliang <baoliang@analysys.com.cn> * [BUG FIX] fix bug: dependent task failed when conditions task exists (#2768) * fix bug 2464: change dependent task for process. * remove unused code * add ut * add ut * update comments Co-authored-by: baoliang <baoliang@analysys.com.cn> * Hourly dependency configuration， 'currentHour' and 'last24Hours' (#2696) * [feature] Add hourly dependency scenarios * [Feature] #2680 add DependentUtilsTest UT Co-authored-by: changqun.xu <changqun.xu@17zuoye.com> Co-authored-by: xuchangqun <changqun.x@gmail.com> * fix sql task bug #2739 (#2741) * Solve the failure to execute non-query sql * fix sql task bug Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: lgcareer <18610854716@163.com> * Worker group adds check * fix * Worker group adds check (#2787) * Worker group adds check * fix * add not worker log and remove worker invalid property (#2784) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory (#2786) * fixed #2788 resolve the bug #2788 (#2789) * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory * fixed #2788 * [BUG FIX] fix bug:cannot pause work flow when task state is "submit success" (#2783) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix bug:#2735 (#2770) 1. store process id in zk. 2. resolve host and port through zk path. 3. modify ui key. * Modify startup parameter worker group value * Fix [Bug] process definition json worker group convert #2794 (#2795) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [BUG FIX]fix bug: Restart the worker service again, the previously submitted successful tasks are not executed bug (#2800) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep Co-authored-by: baoliang <baoliang@analysys.com.cn> * delete unnecessary configuration items (#2803) * rename worker_group_id to worker_group and set the value of worker_group_name (#2801) * process definition json worker group convert #2794 (#2809) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * compatible old version host not port delete log file (#2811) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * compatible old version host not port delete log file Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes (#2806) * delete unnecessary configuration items * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes * fix oracle connect failure (#2812) * use method getJdbcUrl of parent * Remove the incorrect print message * Modify process group workerGroup value display and filter child node duplicate values * Repair process definition bulk delete function * when init workflow, the tenantId linked by the tenantId of user * dag download does not refresh, modify the task instance operation width value * fix * [bug fix]fix bug: After the master is fault-tolerant, it cannot resume operation (#2813) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep * add null point check * fix bug:After the master is fault-tolerant, it cannot resume operation * fix bug: do not failover the host is 'NULL' process Co-authored-by: baoliang <baoliang@analysys.com.cn> * When update the data source,the host and port show error (#2821) * When update the data source,the host and port show error * update DataSourceServiceTest * update DataSourceServiceTest * update DataSourceServiceTest * Fix ORACLE service name value display * Add tips for download workflow * fix * [bug fix] fix: The workflow is fault-tolerant and 2 task instances are generated (#2833) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep * add null point check * fix bug:After the master is fault-tolerant, it cannot resume operation * fix bug: do not failover the host is 'NULL' process * fix bug:worker failover error. Co-authored-by: baoliang <baoliang@analysys.com.cn> * add maven Xmx to 5g * fix bug: send task result to master until success. (#2839) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed Co-authored-by: baoliang <baoliang@analysys.com.cn> * Fix errors when running on win10 (#2842) 1. DS cant run bat script 2. DS cant run python script 3. DS cant run datax script * Fix abnormal display of regular worker parameters * add source license full text into source license (#2840) * add source license full text into source license * exclude ScriptRunner.java on rat check * fix table not exist when init db metadata (#2838) * fix table not exist when init db metadata * fix db init error * fix ds-1.3.0 init db * init db modify process instance json Co-authored-by: eights <yelli.hl@foxmail.com> * change notice copyright date from 2019 to 2019-2020 (#2847) * add source license full text into source license * exclude ScriptRunner.java on rat check * change notice copyright date from 2019 to 2019-2020 * fix [BUG] TaskExecutionContextCacheManagerImpl Do not execute removeByTaskInstanceId #2745 (#2754) * mr resource display and create user username length cannot be less than 3 * fix * fix * fix * fix table T_DS_ALERT (#2854) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT * fix * fix * modify t_ds_task_instance app_link change sql (#2861) * change max length of user name to 39 (#2856) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed * change max length of username to 39 Co-authored-by: baoliang <baoliang@analysys.com.cn> * copy resources need get top directory first (#2866) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory (#2876) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory * Fix bug:If user didn't set the value of tenant,release process definition fail (#2885) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory * Fix bug:If user didn't set the value of tenant,release process definition online fail * merge method updateuser if and fix bug#2892 fix [BUG] When editing user information, clear the phone number, the database table t_ds_user.phone is not cleared #2892 * fix bug: sqoop mysql import params error (#2896) * fix bug: sqoop mysql import params error * fix bug: sqoop mysql import params error * Fixed selection of tenant value and defalut changed to lower case * update how to build and remove docs link (#2906) * Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908) * fix create table sql exception (#2912) fix create table sql exception * fix #2910 master server will show exception for some time when it restart (#2913) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * Fixbug datax task (#2909) * fix: local param bug * fix: UT bug Co-authored-by: Rubik-W <whm_777@163.com> * [license] add license and notice (#2916) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed * change max length of username to 39 * test for gc * change version to 1.3.0 * check and add some license files * check and add some license files * revert Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix oom when no master is active in dev-1.3.0 (#2918) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * fix oom when no master is active * fix worker oom when master server restart * fix oom * fix * add UT * fix worker group config no effect * Python, sql, sqoop,datax task node editor adds zoom function #2929 (#2933) * Python, sql, sqoop task node editor adds zoom function * fix * change 1.3.0 to 1.3.0-snapshot * add janino-3.0.12.jar * delete duplicate codes * add commons-compiler-3.0.12.jar * change delete status according to delete action result * Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder * Change email to default (#2981) * add mybatis-3 notice in the top-level notice (#3003) * fix download resource file that under the directory error (#3007) * add mybatis-3 notice in the top-level notice * fix download resource file that under the directory error * Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008) * Change email to default * Fix unfiltered jar files in resource directory and UDF upload resource parameters * fix singe resource manager will NPE (#3013) * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * fix oom when no master is active * fix worker oom when master server restart * fix oom * fix * add UT * fix worker group config no effect * fix singe resource manager will NPE * Update HadoopUtilsTest.java * merge from dev-1.3.0 * update ut * remove duplicate code * remove exception ut * remove exception ut * remove exception ut * remove exception ut * remove exception ut * [bugfix] remove Conflicting configuration sudo and user (#3038) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * [bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * [feature] readme.md adds instructions for changing environment variables (#3031) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * merge from dev * Change favicon.ico icon introduction method and package compilation to increase version number (#3030) Co-authored-by: Jiajie Zhong <zhongjiajie955@hotmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: bao liang <29528966+lenboo@users.noreply.github.com> Co-authored-by: baoliang <baoliang@analysys.com.cn> Co-authored-by: Simon <3656562@qq.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: 张世鸣 <zhangshiming@cvte.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: liwenhe1993 <liwenhe@apache.org> Co-authored-by: xiaochun.liu <xiaochun.liu@centurygame.com> Co-authored-by: lidongdai <escheduler@outlook.com> Co-authored-by: dailidong <dolphinschedule@gmail.com> Co-authored-by: Tboy <guo.jiwei@immomo.com> Co-authored-by: xuchangqun <58328021+xuchangqun@users.noreply.github.com> Co-authored-by: changqun.xu <changqun.xu@17zuoye.com> Co-authored-by: xuchangqun <changqun.x@gmail.com> Co-authored-by: zixi0825 <649790970@qq.com> Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com> Co-authored-by: tlhhup <137273278@qq.com> Co-authored-by: yelli.hl@foxmail.com <amarantine@my.com> Co-authored-by: eights <yelli.hl@foxmail.com> Co-authored-by: yaoyao <42244568+1445103710@users.noreply.github.com> Co-authored-by: 小清 <62982788+597365581@users.noreply.github.com> Co-authored-by: gabry.wu <gabrywu@apache.org> Co-authored-by: t1mon <178317391@qq.com> Co-authored-by: Rubik-W <39549317+Rubik-W@users.noreply.github.com> Co-authored-by: Rubik-W <whm_777@163.com> Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>	4 years ago
zixi0825	9bf67d80d0	Revise annotation spelling errors & Enhanced code robustness (#3042) ... * revise annotation spelling errors & enhanced code robustness * revise annotation spelling errors & enhanced code robustness Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	4 years ago
lenboo	b81872cacd	merge from dev-1.3.0	4 years ago
superScala	8031c1624a	add break & default logic for NettyDecoder.decode (#2969) ... * add break & default logic for NettyDecoder.decode * fix the bad code smells Co-authored-by: gabry <wu_shao_jie@qq.com> Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
superScala	3a7fd725c7	first show: remove unnecessary code (#2968) ... Co-authored-by: gabry <wu_shao_jie@qq.com>	4 years ago
simon824	24120a4641	fix the bad code smell	5 years ago
simon824	65841a5709	1. change windows new line 'CR' to linux new line 'LF' ... 2. solve conflict	5 years ago
simon824	f643981f48	1. change windows new line 'CR' to linux new line 'LF' ... 2. Format code	5 years ago
simon824	fad09075f9	remove fastjson maven dependence	5 years ago
simon824	6e907f150c	1. specified jackson Date format. ... 2. remove getMapper method,replace with toList() 3. rewrite toList method,support constructCollectionType. 4. parseObject(resp, Map.class) replace to toMap() method 5. rename JacksonSerialize to JsonSerializer rewrite createArrayNode,createObjectNode method will Affect too many lines ，i will fix it in the next pr.	5 years ago
dailidong	186ba3baab	fix oom when no master is active in dev-1.3.0 (#2918) ... * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * fix oom when no master is active * fix worker oom when master server restart * fix oom * fix * add UT * fix worker group config no effect	5 years ago
bao liang	422fe5136d	[license] add license and notice (#2916) ... * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed * change max length of username to 39 * test for gc * change version to 1.3.0 * check and add some license files * check and add some license files * revert Co-authored-by: baoliang <baoliang@analysys.com.cn>	5 years ago
simon	33bd6586dd	Using Jackson instead of Fastjson	5 years ago
qiaozhanwei	f4583d78e9	add UT (#2717) ... * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	443a6d1935	delete log files while deleting process instances #2463 (#2693) ... * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	e837a73fcd	EnterpriseWeChatUtils modify (#2502) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix * host and workergroup compatible * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	1f43925c12	remove ExecuteTaskRequestCommand and ExecuteTaskResponseCommand	5 years ago
qiaozhanwei	70d6360149	startup conflict reslove	5 years ago
dailidong	7e9f45e514	[Refactor worker] Optimize code , reduce cost time from 60ms to 0.5ms (#2318) ... * update logback * update log * refactor worker registry (#2107) * Refactor worker (#2115) * refactor worker registry * refactor master server * Modify workgroupid parameter name (#2105) * Delete worker group management page * Modify workgroupid parameter name * Refactor worker (#2121) * refactor worker registry * refactor master server * refactor MasterSchedulerService * cancelTaskInstance set TaskExecutionContext host,logPath,executePath (#2126) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * 1，worker TaskPros use TaskExecutionContext replase 2，Master kill Task , KillTaskProcessor modify * worker remove db * ShellTask modify * master persistence processId and appIds * master persistence processId and appIds * master add kill task logic * master add kill task logic * master add kill task logic * javadoc error modify * remove chinese log * executeDirectly method add Override * remote module modify * TaskKillResponseProcessor command type modify * create buildKillCommand * host add host:port format * host add host:port format * TaskAckProcessor modify * TaskAckProcessor modify * task prioriry refator * remove ITaskQueue * task prioriry refator * remove ITaskQueue * TaskPriority refactor * remove logs * WorkerServer refactor * MasterSchedulerService modify * WorkerConfig listen port modify * modify master and worker listen port * cancelTaskInstance set TaskExecutionContext host,logPath,executePath * cancelTaskInstance set TaskExecutionContext host,logPath,executePath Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * not exist in openjdk,just delete * add master and worker properties * add master and worker properties * add master and worker properties * fix cpu 100% bug * simplify master、 worker、alert、dao properties * add master and worker properties * add master and worker properties * add master and worker properties * Optimize code , reduce cost time from 60ms to 0.5ms * merge code form remote Co-authored-by: Tboy <guo.jiwei@immomo.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	03e29b9311	1，ZookeeperRegister use common.properties zookeeperRoot path 2，api start exclude org.apache.dolphinscheduler.server.* (#2307) ... * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * 1，worker TaskPros use TaskExecutionContext replase 2，Master kill Task , KillTaskProcessor modify * worker remove db * ShellTask modify * master persistence processId and appIds * master persistence processId and appIds * master add kill task logic * master add kill task logic * master add kill task logic * javadoc error modify * remove chinese log * executeDirectly method add Override * remote module modify * TaskKillResponseProcessor command type modify * create buildKillCommand * host add host:port format * host add host:port format * TaskAckProcessor modify * TaskAckProcessor modify * task prioriry refator * remove ITaskQueue * task prioriry refator * remove ITaskQueue * TaskPriority refactor * remove logs * WorkerServer refactor * MasterSchedulerService modify * WorkerConfig listen port modify * modify master and worker listen port * cancelTaskInstance set TaskExecutionContext host,logPath,executePath * cancelTaskInstance set TaskExecutionContext host,logPath,executePath * Encapsulate the parameters required by sqltask * 1，Encapsulate the parameters required by sqltask 2，SQLTask optimization * AbstractTask modify * ProcedureTask optimization * MasterSchedulerService modify * TaskUpdateQueueConsumer modify * test * DataxTask process run debug * DataxTask process run debug * add protobuf dependency，MR、Spark task etc need this * TaskUpdateQueueConsumer modify * TaskExecutionContextBuilder set TaskInstance workgroup * WorkerGroupService queryAllGroup modify query available work group * 1，get workergroup from zk modify 2，SpringConnectionFactory repeat load modify * master and worker register ip use OSUtils.getHost() * ProcessInstance host set ip:port format * worker fault tolerance modify * Constants and .env modify * master fault tolerant bug modify * UT add pom.xml * timing online modify * when taskResponse is faster than taskAck to db，task state will error add async queue and new a thread reslove this problem * TaskExecutionContext set host * 1，TaskManager refactor 2， api start load server dolphinschedule-daemon.sh modify * 1，TaskManager refactor 2， api start load server dolphinschedule-daemon.sh modify * add UT in pom.xml * revert dolphinscheduler-daemon.sh * ZookeeperRegister use common.properties zookeeperRoot path * api start exclude org.apache.dolphinscheduler.server.* * ZookeeperRegister use common.properties zookeeperRoot path * 1，api start load server filter 2，SHELL task exitStatusCode modify * java doc error modify * java doc error modify * remove todo Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
Tboy	92fd6479a9	Refactor worker (#2279) ... * let quartz use the same datasource * move master/worker config from dao.properties to each config add master/worker registry test * move mybatis config from application.properties to SpringConnectionFactory * move mybatis-plus config from application.properties to SpringConnectionFactory * refactor TaskCallbackService * add ZookeeperNodeManagerTest * add NettyExecutorManagerTest * refactor TaskKillProcessor	5 years ago
khadgarmage	cddf803ba0	license and checkoutv2 fix (#2261)	5 years ago
gabry.wu	4318e860d5	Adapting partial code(file name start with R) to the sonar cloud rule (#2243)	5 years ago
tswstarplanet	f4897b563d	fix blocker problem (#2244) ... * fix blocker problem * use error level to log exception	5 years ago
dailidong	ce2853ad4c	add master and worker properties and remove data quality config (#2211) ... * update logback * update log * refactor worker registry (#2107) * Refactor worker (#2115) * refactor worker registry * refactor master server * Modify workgroupid parameter name (#2105) * Delete worker group management page * Modify workgroupid parameter name * Refactor worker (#2121) * refactor worker registry * refactor master server * refactor MasterSchedulerService * cancelTaskInstance set TaskExecutionContext host,logPath,executePath (#2126) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * 1，worker TaskPros use TaskExecutionContext replase 2，Master kill Task , KillTaskProcessor modify * worker remove db * ShellTask modify * master persistence processId and appIds * master persistence processId and appIds * master add kill task logic * master add kill task logic * master add kill task logic * javadoc error modify * remove chinese log * executeDirectly method add Override * remote module modify * TaskKillResponseProcessor command type modify * create buildKillCommand * host add host:port format * host add host:port format * TaskAckProcessor modify * TaskAckProcessor modify * task prioriry refator * remove ITaskQueue * task prioriry refator * remove ITaskQueue * TaskPriority refactor * remove logs * WorkerServer refactor * MasterSchedulerService modify * WorkerConfig listen port modify * modify master and worker listen port * cancelTaskInstance set TaskExecutionContext host,logPath,executePath * cancelTaskInstance set TaskExecutionContext host,logPath,executePath Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * not exist in openjdk,just delete * add master and worker properties * add master and worker properties * add master and worker properties Co-authored-by: Tboy <guo.jiwei@immomo.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
gabry.wu	0e5fb86bef	Adapting partial code(file name start with N) to the sonar cloud rule (#2215)	5 years ago
t1mon	f6f29f4abb	Replace Charset.forName("UTF-8") with StandardCharsets.UTF_8. (#2193)	5 years ago
gabry.wu	1658176ef5	Adapting partial code(file name start with P #1) to the sonar cloud rule (#2171) (#2187)	5 years ago
t1mon	16eeaf50b4	Fix javadoc and DataxTaskTest UT error (#2147) ... * Fix javadoc and DataxTaskTest UT error * Fix UT error * LoggerServiceTest UT error * WorkerGroupServiceTest UT error Modify Host.of() * Add address NPE check * Trigger actions rerun * Try to solve maven VM crash * Try to solve maven VM crash 1 * Try to solve maven VM crash 2 * Try to solve maven VM crash 3	5 years ago
Rubik-W	275df85250	fix: remove redundant import class (#2110)	5 years ago
gabry.wu	0e1dd8d7d9	remove incorrect or unnecessary URL tag (#2099)	5 years ago
qiaozhanwei	d5c795bd45	fix ugly logger usage (#2063) ... * fix ugly logger usage * remove space	5 years ago
qiaozhanwei	3e5a939913	delete unused import (#2066)	5 years ago
Tboy	71c11bd594	refactor kill logic (#2060)	5 years ago
Technoboy-	b4e4a64e50	refactor kill logic	5 years ago
qiaozhanwei	bb3885cfe2	master add kill task logic (#2058) ... * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * 1，worker TaskPros use TaskExecutionContext replase 2，Master kill Task , KillTaskProcessor modify * worker remove db * ShellTask modify * master persistence processId and appIds * master persistence processId and appIds * master add kill task logic * master add kill task logic * master add kill task logic * javadoc error modify	5 years ago
Tboy	3bad56ca15	Refactor worker (#2042) ... * Refactor worker (#10) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * Refactor worker (#2018) * Refactor worker (#7) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * Refactor worker (#8) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * add kill command Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * add TaskInstanceCacheManager receive Worker report result，modify master polling db transfrom to cache (#2021) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * refactor heartbeat logic * update registry and add worker group * add worker group Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
Technoboy-	952d6edae8	add worker group	5 years ago
qiaozhanwei	7f94122f6e	1，worker TaskPros use TaskExecutionContext replase TaskPros 2，Master kill Task , KillTaskProcessor modify (#2039) ... * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * taskInstanceCache is null ,need load from db * 1，worker TaskPros use TaskExecutionContext replase 2，Master kill Task , KillTaskProcessor modify	5 years ago
Tboy	726706835d	Refactor worker (#10) ... * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * Refactor worker (#2018) * Refactor worker (#7) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * Refactor worker (#8) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * add kill command Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * add TaskInstanceCacheManager receive Worker report result，modify master polling db transfrom to cache (#2021) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
qiaozhanwei	2bb5ebaf3a	add TaskInstanceCacheManager receive Worker report result，modify master polling db transfrom to cache (#2021) ... * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type * add TaskInstanceCacheManager receive Worker report result * TaskInstance setExecutePath * add TaskInstanceCacheManager to receive Worker Task result report * TaskInstanceCacheManager add remove method * add license * add dispatcht task method * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access * AbstractCommandExecutor remove db access	5 years ago
Tboy	9dc9745a80	Refactor worker (#2018) ... * Refactor worker (#7) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * Refactor worker (#8) * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type (#2012) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment * ExecutorManager interface add generic type Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * add kill command Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
Technoboy-	67e7a6c849	add kill command	5 years ago
Tboy	89a70f8b2b	Refactor worker (#6) ... * Refactor worker (#2000) * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates * add- register processor Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * buildAckCommand taskInstanceId not set modify (#2002) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify (#2004) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment (#2006) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
qiaozhanwei	6053f9b2df	add comment (#2006) ... * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify * buildAckCommand taskInstanceId not set modify * java doc error modify * add comment	5 years ago
Tboy	e4679109af	Refactor worker (#1997) ... * Refactor worker (#2) * Refactor worker (#1993) * Refactor worker (#1) * add TaskResponseProcessor (#1983) * 1, master persistent task 2. extract master and worker communication model (#1992) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * TaskExecutionContext create modify (#1994) * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * 1, master persistent task 2. extract master and worker communication model * add license * modify javadoc error * TaskExecutionContext create modify Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * updates Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago