delete unnecessary configuration items (#2803)

ambari_plugin/common-services/DOLPHIN/1.3.0/configuration/dolphin-alert.xml

@@ -21,12 +21,6 @@
 		<description>alert type is EMAIL/SMS</description>
 		<on-ambari-upgrade add="true"/>
 	</property>
-	<property>
-		<name>alert.template</name>
-		<value>html</value>
-		<description>alter msg template, default is html template</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
 	<property>
 		<name>mail.protocol</name>
 		<value>SMTP</value>

ambari_plugin/common-services/DOLPHIN/1.3.0/configuration/dolphin-datasource.xml

@@ -203,265 +203,4 @@
 		<description></description>
 		<on-ambari-upgrade add="true"/>
 	</property>
-
-	<property>
-		<name>mybatis-plus.mapper-locations</name>
-		<value>classpath*:/org.apache.dolphinscheduler.dao.mapper/*.xml</value>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.typeEnumsPackage</name>
-		<value>org.apache.dolphinscheduler.*.enums</value>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.typeAliasesPackage</name>
-		<value>org.apache.dolphinscheduler.dao.entity</value>
-		<description>
-			Entity scan, where multiple packages are separated by a comma or semicolon
-		</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.id-type</name>
-		<value>AUTO</value>
-		<value-attributes>
-			<type>value-list</type>
-			<entries>
-				<entry>
-					<value>AUTO</value>
-					<label>AUTO</label>
-				</entry>
-				<entry>
-					<value>INPUT</value>
-					<label>INPUT</label>
-				</entry>
-				<entry>
-					<value>ID_WORKER</value>
-					<label>ID_WORKER</label>
-				</entry>
-				<entry>
-					<value>UUID</value>
-					<label>UUID</label>
-				</entry>
-			</entries>
-			<selection-cardinality>1</selection-cardinality>
-		</value-attributes>
-		<description>
-			Primary key type AUTO:" database ID AUTO ",
-			INPUT:" user INPUT ID",
-			ID_WORKER:" global unique ID (numeric type unique ID)",
-			UUID:" global unique ID UUID";
-		</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.field-strategy</name>
-		<value>NOT_NULL</value>
-		<value-attributes>
-			<type>value-list</type>
-			<entries>
-				<entry>
-					<value>IGNORED</value>
-					<label>IGNORED</label>
-				</entry>
-				<entry>
-					<value>NOT_NULL</value>
-					<label>NOT_NULL</label>
-				</entry>
-				<entry>
-					<value>NOT_EMPTY</value>
-					<label>NOT_EMPTY</label>
-				</entry>
-			</entries>
-			<selection-cardinality>1</selection-cardinality>
-		</value-attributes>
-		<description>
-			Field policy IGNORED:" ignore judgment ",
-			NOT_NULL:" not NULL judgment "),
-			NOT_EMPTY:" not NULL judgment"
-		</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.column-underline</name>
-		<value>true</value>
-		<value-attributes>
-			<type>boolean</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.logic-delete-value</name>
-		<value>1</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.logic-not-delete-value</name>
-		<value>0</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.global-config.db-config.banner</name>
-		<value>true</value>
-		<value-attributes>
-			<type>boolean</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-
-	<property>
-		<name>mybatis-plus.configuration.map-underscore-to-camel-case</name>
-		<value>true</value>
-		<value-attributes>
-			<type>boolean</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.configuration.cache-enabled</name>
-		<value>false</value>
-		<value-attributes>
-			<type>boolean</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.configuration.call-setters-on-nulls</name>
-		<value>true</value>
-		<value-attributes>
-			<type>boolean</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>mybatis-plus.configuration.jdbc-type-for-null</name>
-		<value>null</value>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.exec.threads</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.exec.task.num</name>
-		<value>20</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.heartbeat.interval</name>
-		<value>10</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.task.commit.retryTimes</name>
-		<value>5</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.task.commit.interval</name>
-		<value>1000</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.max.cpuload.avg</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>master.reserved.memory</name>
-		<value>0.1</value>
-		<value-attributes>
-			<type>float</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.exec.threads</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.heartbeat.interval</name>
-		<value>10</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.fetch.task.num</name>
-		<value>3</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.max.cpuload.avg</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.reserved.memory</name>
-		<value>0.1</value>
-		<value-attributes>
-			<type>float</type>
-		</value-attributes>
-		<description></description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-
 </configuration>

ambari_plugin/common-services/DOLPHIN/1.3.0/configuration/dolphin-worker.xml

@@ -33,15 +33,6 @@
 		<description>worker heartbeat interval</description>
 		<on-ambari-upgrade add="true"/>
 	</property>
-	<property>
-		<name>worker.fetch.task.num</name>
-		<value>3</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description>submit the number of tasks at a time</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
 	<property>
 		<name>worker.max.cpuload.avg</name>
 		<value>100</value>

ambari_plugin/common-services/DOLPHIN/1.3.0/configuration/dolphin-zookeeper.xml

@@ -15,14 +15,6 @@
   ~ limitations under the License.
   -->
 <configuration>
-	<property>
-		<name>dolphinscheduler.queue.impl</name>
-		<value>zookeeper</value>
-		<description>
-			Task queue implementation, default "zookeeper"
-		</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
 	<property>
 		<name>zookeeper.dolphinscheduler.root</name>
 		<value>/dolphinscheduler</value>

ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/params.py

@@ -114,10 +114,6 @@ else:
 
 dolphin_common_map_tmp = config['configurations']['dolphin-common']
 data_basedir_path = dolphin_common_map_tmp['data.basedir.path']
-process_exec_basepath = data_basedir_path + '/exec'
-data_download_basedir_path = data_basedir_path + '/download'
-dolphin_common_map['process.exec.basepath'] = process_exec_basepath
-dolphin_common_map['data.download.basedir.path'] = data_download_basedir_path
 dolphin_common_map['dolphinscheduler.env.path'] = dolphin_env_path
 dolphin_common_map.update(config['configurations']['dolphin-common'])