add assembly include & fix properties

byzer-org · Apr 25, 2022 · 2867172 · 2867172
1 parent b3e8f6e
commit 2867172
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/conf/byzer.properties b/conf/byzer.properties
@@ -25,13 +25,13 @@ byzer.server.mode=server
 
 # spark properties
 spark.master=local[*]
-#spark.driver.memory=2g
-#spark.sql.hive.thriftServer.singleSession=true
-#spark.kryoserializer.buffer=256k
-#spark.kryoserializer.buffer.max=1024m
+spark.driver.memory=2g
+spark.sql.hive.thriftServer.singleSession=true
+spark.kryoserializer.buffer=256k
+spark.kryoserializer.buffer.max=1024m
 #spark.sql.shuffle.partitions=1
-#spark.serializer=org.apache.spark.serializer.KryoSerializer
-#spark.scheduler.mode=FAIR
+spark.serializer=org.apache.spark.serializer.KryoSerializer
+spark.scheduler.mode=FAIR
 #spark.hadoop.mapreduce.job.run-local=true
 #spark.driver.maxResultSize=2g
 #spark.sql.codegen.wholeStage=true

diff --git a/conf/byzer.properties.server.example b/conf/byzer.properties.server.example
@@ -7,12 +7,4 @@ streaming.thrift=false
 streaming.platform=spark
 streaming.spark.service=true
 streaming.driver.port=9003
-streaming.enableHiveSupport=false
-
-spark.master=local[*]
-spark.driver.memory=2g
-spark.scheduler.mode=FAIR
-spark.sql.hive.thriftServer.singleSession=true
-spark.kryoserializer.buffer=256k
-spark.kryoserializer.buffer.max=1024m
-spark.serializer=org.apache.spark.serializer.KryoSerializer
+streaming.enableHiveSupport=false
diff --git a/streamingpro-assembly/src/main/assembly/assembly.xml b/streamingpro-assembly/src/main/assembly/assembly.xml
@@ -51,6 +51,8 @@
             <includes>
                 <include>byzer.properties</include>
                 <include>byzer.properties.override</include>
+                <include>byzer.properties.all-in-one.example</include>
+                <include>byzer.properties.server.example</include>
                 <include>byzer-server-log4j.properties</include>
                 <include>byzer-tools-log4j.properties</include>
             </includes>