Jelajahi Sumber

fix: yarn-site idctest

Zhang Li 2 tahun lalu
induk
melakukan
61fe1fb51d
3 mengubah file dengan 74 tambahan dan 10 penghapusan
  1. 2 2
      Makefile
  2. 0 0
      docker/Dockerfile.idc
  3. 72 8
      docker/idctest/conf/yarn-site.xml

+ 2 - 2
Makefile

@@ -11,11 +11,11 @@ test:
 	@DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile  --build-arg BUILDKIT_INLINE_CACHE=1  --target image-test -t livy:test .
 
 idctest:
-	@docker build -f docker/Dockerfile.idctest   --target image-idctest -t registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idctest .
+	@docker build -f docker/Dockerfile.idc   --target image-idctest -t registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idctest .
 	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idctest
 
 idcprod:
-	@docker build -f docker/Dockerfile.idctest   --target image-idcprod -t registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idcprod .
+	@docker build -f docker/Dockerfile.idc   --target image-idcprod -t registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idcprod .
 	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/livy-0.7:idcprod
 
 txtest:

+ 0 - 0
docker/Dockerfile.idctest → docker/Dockerfile.idc


+ 72 - 8
docker/idctest/conf/yarn-site.xml

@@ -11,29 +11,93 @@
     <value>*</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.address</name>
-    <value>cdhtestnm02.yili.com:8032</value>
+    <name>yarn.resourcemanager.ha.enabled</name>
+    <value>true</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.admin.address</name>
-    <value>cdhtestnm02.yili.com:8033</value>
+    <name>yarn.resourcemanager.ha.automatic-failover.enabled</name>
+    <value>true</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.ha.automatic-failover.embedded</name>
+    <value>true</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.recovery.enabled</name>
+    <value>true</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.zk-address</name>
+    <value>cdhtestdn06.yili.com:2181,cdhtestdn07.yili.com:2181,cdhtestdn08.yili.com:2181</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.store.class</name>
+    <value>org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore</value>
+  </property>
+  <property>
+    <name>yarn.client.failover-sleep-base-ms</name>
+    <value>100</value>
+  </property>
+  <property>
+    <name>yarn.client.failover-sleep-max-ms</name>
+    <value>2000</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.cluster-id</name>
+    <value>yarnRM</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.scheduler.address</name>
+    <name>yarn.resourcemanager.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8032</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.scheduler.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8030</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.resource-tracker.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8031</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.admin.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8033</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.webapp.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8088</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.webapp.https.address.rm192</name>
+    <value>cdhtestnm01.yili.com:8090</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.address.rm193</name>
+    <value>cdhtestnm02.yili.com:8032</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.scheduler.address.rm193</name>
     <value>cdhtestnm02.yili.com:8030</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.resource-tracker.address</name>
+    <name>yarn.resourcemanager.resource-tracker.address.rm193</name>
     <value>cdhtestnm02.yili.com:8031</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.webapp.address</name>
+    <name>yarn.resourcemanager.admin.address.rm193</name>
+    <value>cdhtestnm02.yili.com:8033</value>
+  </property>
+  <property>
+    <name>yarn.resourcemanager.webapp.address.rm193</name>
     <value>cdhtestnm02.yili.com:8088</value>
   </property>
   <property>
-    <name>yarn.resourcemanager.webapp.https.address</name>
+    <name>yarn.resourcemanager.webapp.https.address.rm193</name>
     <value>cdhtestnm02.yili.com:8090</value>
   </property>
+  <property>
+    <name>yarn.resourcemanager.ha.rm-ids</name>
+    <value>rm192,rm193</value>
+  </property>
   <property>
     <name>yarn.resourcemanager.client.thread-count</name>
     <value>50</value>