From 4d36423d161bd0ace10d11048b07a451e7695774 Mon Sep 17 00:00:00 2001
From: chenmingyu <chenmingyu@baidu.com>
Date: Wed, 31 Oct 2018 19:25:46 +0800
Subject: [PATCH] Fix some compile and script errors

1. Fix error class in start_fe.sh and start_broker.sh.
2. Add log4j2.xml in fe/src/test/resources/ to run fe ut without log4j warnings.
3. Reduce the test file size in be ut.
---
 be/test/olap/file_utils_test.cpp              |  4 ++--
 bin/start_fe.sh                               |  8 +------
 .../apache/doris/task/LoadEtlTaskTest.java    |  4 +++-
 .../doris/task/LoadPendingTaskTest.java       |  2 ++
 fe/src/test/resources/log4j2.xml              | 24 +++++++++++++++++++
 .../apache_hdfs_broker/bin/start_broker.sh    |  2 +-
 6 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 fe/src/test/resources/log4j2.xml

diff --git a/be/test/olap/file_utils_test.cpp b/be/test/olap/file_utils_test.cpp
index 7fa3a34f998eb1..b9e851b9de5b61 100644
--- a/be/test/olap/file_utils_test.cpp
+++ b/be/test/olap/file_utils_test.cpp
@@ -68,7 +68,7 @@ TEST_F(FileUtilsTest, TestCopyFile) {
     char* large_bytes2[(1 << 12)];
     memset(large_bytes2, 0, sizeof(char)*((1 << 12)));
     int i = 0;
-    while (i < 1 << 19) {
+    while (i < 1 << 10) {
         src_file_handler.write(large_bytes2, ((1 << 12)));
         ++i;
     }
@@ -80,7 +80,7 @@ TEST_F(FileUtilsTest, TestCopyFile) {
     FileHandler dst_file_handler;
     dst_file_handler.open(dst_file_name, O_RDONLY);
     int64_t dst_length = dst_file_handler.length();
-    int64_t src_length = 2147483661;
+    int64_t src_length = 4194317;
     ASSERT_EQ(src_length, dst_length);
 }
 
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
index 5fc36dead49a18..fe60b69dcfc9c5 100755
--- a/bin/start_fe.sh
+++ b/bin/start_fe.sh
@@ -51,12 +51,6 @@ JAVA=$JAVA_HOME/bin/java
 for f in $DORIS_HOME/lib/*.jar; do
   CLASSPATH=$f:${CLASSPATH};
 done
-for f in $DORIS_HOME/lib/kudu-client/*.jar; do
-  CLASSPATH=$f:${CLASSPATH};
-done
-for f in $DORIS_HOME/lib/k8s-client/*.jar; do
-  CLASSPATH=$f:${CLASSPATH};
-done
 export CLASSPATH=${CLASSPATH}:${DORIS_HOME}/lib
 
 if [ ! -d $LOG_DIR ]; then
@@ -79,6 +73,6 @@ else
 fi
 
 echo `date` >> $LOG_DIR/fe.out
-nohup $LIMIT $JAVA $JAVA_OPTS com.baidu.palo.PaloFe "$@" >> $LOG_DIR/fe.out 2>&1 </dev/null &
+nohup $LIMIT $JAVA $JAVA_OPTS org.apache.doris.PaloFe "$@" >> $LOG_DIR/fe.out 2>&1 </dev/null &
 
 echo $! > $pidfile
diff --git a/fe/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java b/fe/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java
index fff25fcf25b7de..eadad00ed77aab 100644
--- a/fe/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java
+++ b/fe/src/test/java/org/apache/doris/task/LoadEtlTaskTest.java
@@ -49,6 +49,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -60,6 +61,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ HadoopLoadEtlTask.class, Catalog.class })
+@PowerMockIgnore("javax.management.*")
 public class LoadEtlTaskTest {
     private long dbId;
     private long tableId;
@@ -184,4 +186,4 @@ public void testRunEtlTask() throws Exception {
         Assert.assertEquals(tabletNum, tabletLoadInfos.size());
     }
     
-}
\ No newline at end of file
+}
diff --git a/fe/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java b/fe/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java
index b41c8d6be62f99..20dc721000eaca 100644
--- a/fe/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java
+++ b/fe/src/test/java/org/apache/doris/task/LoadPendingTaskTest.java
@@ -43,6 +43,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -53,6 +54,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ HadoopLoadPendingTask.class, Catalog.class })
+@PowerMockIgnore("javax.management.*")
 public class LoadPendingTaskTest {
     private long dbId;
     private long tableId;
diff --git a/fe/src/test/resources/log4j2.xml b/fe/src/test/resources/log4j2.xml
new file mode 100644
index 00000000000000..7e0957b1a926d0
--- /dev/null
+++ b/fe/src/test/resources/log4j2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L - %msg%n" />
+        </Console>
+
+        <RollingFile name="RollingFile" filename="log/fe_test.log"
+            filepattern="${logPath}/%d{YYYYMMddHHmmss}-fargo.log">
+            <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L - %msg%n" />
+            <Policies>
+                <SizeBasedTriggeringPolicy size="100 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="20" />
+        </RollingFile>
+
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="Console" />
+            <AppenderRef ref="RollingFile" />
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/fs_brokers/apache_hdfs_broker/bin/start_broker.sh b/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
index f021a3a32736ff..9642d5daf23c4c 100755
--- a/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
+++ b/fs_brokers/apache_hdfs_broker/bin/start_broker.sh
@@ -60,6 +60,6 @@ if [ ! -d $BROKER_LOG_DIR ]; then
 fi
 
 echo `date` >> $BROKER_LOG_DIR/apache_hdfs_broker.out
-nohup $LIMIT $JAVA $JAVA_OPTS com.baidu.palo.broker.hdfs.BrokerBootstrap "$@" >> $BROKER_LOG_DIR/apache_hdfs_broker.out 2>&1 </dev/null &
+nohup $LIMIT $JAVA $JAVA_OPTS org.apache.doris.broker.hdfs.BrokerBootstrap "$@" >> $BROKER_LOG_DIR/apache_hdfs_broker.out 2>&1 </dev/null &
 
 echo $! > $pidfile