Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev (353379d4) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
		public class MasterSchedulerService extends Thread {

		/**
		* logger of MasterSchedulerThread
		* logger of MasterSchedulerService
		*/
		private static final Logger logger = LoggerFactory.getLogger(MasterSchedulerService.class);

		@@ -80,7 +80,7 @@ public class MasterSchedulerService extends Thread {


		/**
		* constructor of MasterSchedulerThread
		* constructor of MasterSchedulerService
		*/
		@PostConstruct
		public void init(){
		@@ -91,7 +91,7 @@ public class MasterSchedulerService extends Thread {

		@Override
		public void start(){
		super.setName("MasterSchedulerThread");
		super.setName("MasterSchedulerService");
		super.start();
		}

		@@ -109,7 +109,7 @@ public class MasterSchedulerService extends Thread {
		}

		/**
		* run of MasterSchedulerThread
		* run of MasterSchedulerService
		*/
		@Override
		public void run() {

+6 −5

Original line number	Diff line number	Diff line
		@@ -27,12 +27,13 @@ dbhost="192.168.xx.xx:3306"
		# db username
		username="xx"

		# db password
		# NOTICE: if there are special characters, please use the \ to escape, for example, `[` escape to `\[`
		password="xx"

		# database name
		dbname="dolphinscheduler"

		# db passwprd
		# NOTICE: if there are special characters, please use the \ to escape, for example, `[` escape to `\[`
		password="xx"

		# zk cluster
		zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Licensed to the Apache Software Foundation (ASF) under one or more
		* contributor license agreements. See the NOTICE file distributed with
		* this work for additional information regarding copyright ownership.
		* The ASF licenses this file to You under the Apache License, Version 2.0
		* (the "License"); you may not use this file except in compliance with
		* the License. You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package org.apache.dolphinscheduler.data.project;

		public class ProcessInstanceData {
		//Process Instance page title
		public static final String PROCESS_INSTANCE_TITLE = "工作流实例 - DolphinScheduler";
		public static final String RERUN_TYPE= "重跑";


		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		*/
		package org.apache.dolphinscheduler.data.project;

		public class CreateProjectData {
		public class ProjectData {
		// create project name
		public static final String PROJECT_NAME = "selenium_project_1";
		// create project description

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		*/
		package org.apache.dolphinscheduler.data.project;

		public class CreateWorkflowData {
		public class WorkflowDefineData {
		/**
		* create workflow data
		*/