From 97444e338b162d27b2ff8a02773a7528592a2c15 Mon Sep 17 00:00:00 2001
From: 88fantasy <88fantasy@gmail.com>
Date: Tue, 14 May 2024 19:24:09 +0800
Subject: [PATCH] [Bugfix]ds db autoinit (#554)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [bugfix][worker] 安装DS时自动初始化元数据库

fix: context名称错误

* [bugfix][worker] yarn 公平调度器去除默认test队列
---
 .../meta/DDP-1.2.2/YARN/etc/hadoop/fair-scheduler.xml          | 3 ++-
 .../datasophon/worker/strategy/ServiceRoleStrategyContext.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.2/YARN/etc/hadoop/fair-scheduler.xml b/datasophon-api/src/main/resources/meta/DDP-1.2.2/YARN/etc/hadoop/fair-scheduler.xml
index 671c1204..da234835 100755
--- a/datasophon-api/src/main/resources/meta/DDP-1.2.2/YARN/etc/hadoop/fair-scheduler.xml
+++ b/datasophon-api/src/main/resources/meta/DDP-1.2.2/YARN/etc/hadoop/fair-scheduler.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <allocations>
+	<!--
 	<queue name="test">
 		<minResources>2048mb,2vcores</minResources>
 		<maxResources>4096mb,4vcores</maxResources>
@@ -7,7 +8,7 @@
 		<maxAMShare>0.5</maxAMShare>
 		<weight>1.0</weight>
 		<schedulingPolicy>fair</schedulingPolicy>
-	</queue>
+	</queue> -->
 	<queuePlacementPolicy>
 		<rule name="specified" create="false"/>
 		<rule name="default" />
diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/ServiceRoleStrategyContext.java b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/ServiceRoleStrategyContext.java
index 2a541792..d63361db 100644
--- a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/ServiceRoleStrategyContext.java
+++ b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/ServiceRoleStrategyContext.java
@@ -56,7 +56,7 @@ public class ServiceRoleStrategyContext {
         map.put("FlinkClient", new FlinkHandlerStrategy("FLINK", "FlinkClient"));
 
         //DolphinScheduler
-        map.put("MasterServer", new DSMasterHandlerStrategy("USCHEDULER", "MasterServer2"));
+        map.put("MasterServer", new DSMasterHandlerStrategy("DS", "MasterServer"));
 
     }