From 2b6377fb3d9d4e6148527417b4344f5cd8d39dc9 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Mon, 11 Apr 2016 19:02:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0MapReduce=E7=9A=84java?=
 =?UTF-8?q?=5Fopts=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=9C=A8=E6=9C=89?=
 =?UTF-8?q?=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8CMapReduce=202.=20=E6=B2=A1=E6=9C=89EntranceNo?=
 =?UTF-8?q?de=E4=B8=8D=E8=BF=9B=E8=A1=8CReduce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/cloud/skywalking/analysis/AnalysisServerDriver.java | 3 +++
 .../skywalking/analysis/chainbuild/ChainBuildMapper.java   | 7 ++++---
 .../com/ai/cloud/skywalking/analysis/config/Config.java    | 4 ++++
 skywalking-analysis/src/main/resources/analysis.conf       | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
index c3b022497..37860944b 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java
@@ -12,6 +12,7 @@ import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil;
 import org.apache.hadoop.io.Text;
@@ -55,6 +56,8 @@ public class AnalysisServerDriver extends Configured implements Tool {
         conf.set("skywalking.analysis.mode", String.valueOf(Config.AnalysisServer.IS_ACCUMULATE_MODE));
         conf.set("hbase.zookeeper.quorum", Config.HBase.ZK_QUORUM);
         conf.set("hbase.zookeeper.property.clientPort", Config.HBase.ZK_CLIENT_PORT);
+        //-XX:+UseParallelGC -XX:ParallelGCThreads=4 -XX:GCTimeRatio=10 -XX:YoungGenerationSizeIncrement=20 -XX:TenuredGenerationSizeIncrement=20 -XX:AdaptiveSizeDecrementScaleFactor=2
+        conf.set("mapred.child.java.opts",Config.MapReduce.java_opts);
         String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
         if (otherArgs.length != 2) {
             System.err.println("Usage: AnalysisServer yyyy-MM-dd/HH:mm:ss yyyy-MM-dd/HH:mm:ss");
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
index c02a7f3bf..8ac5a17d5 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
@@ -19,7 +19,6 @@ import org.apache.hadoop.io.Text;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 import java.io.IOException;
 import java.util.*;
 
@@ -56,8 +55,10 @@ public class ChainBuildMapper extends TableMapper<Text, Text> {
             chainInfo = spanToChainInfo(Bytes.toString(key.get()), spanList);
             logger.debug("convert tid[" + Bytes.toString(key.get())
                     + "] to chain with cid[" + chainInfo.getCID() + "].");
-            context.write(
-                    new Text(chainInfo.getCallEntrance()), new Text(new Gson().toJson(chainInfo)));
+            if (chainInfo.getCallEntrance() != null && chainInfo.getCallEntrance().length() > 0) {
+                context.write(
+                        new Text(chainInfo.getCallEntrance()), new Text(new Gson().toJson(chainInfo)));
+            }
         } catch (Exception e) {
             logger.error("Failed to mapper call chain[" + key.toString() + "]",
                     e);
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
index 240ce84f4..01df2cabe 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/Config.java
@@ -29,4 +29,8 @@ public class Config {
     public static class AnalysisServer{
         public static boolean IS_ACCUMULATE_MODE = true;
     }
+
+    public static class MapReduce{
+        public static String java_opts = "-Xmx200m";
+    }
 }
diff --git a/skywalking-analysis/src/main/resources/analysis.conf b/skywalking-analysis/src/main/resources/analysis.conf
index e4369b675..2ece0b01e 100644
--- a/skywalking-analysis/src/main/resources/analysis.conf
+++ b/skywalking-analysis/src/main/resources/analysis.conf
@@ -15,4 +15,6 @@ filter.filter_package_name=com.ai.cloud.skywalking.analysis.chainbuild.filter.im
 
 chainnodesummary.interval=1
 
-reducer.reducer_number=4
\ No newline at end of file
+reducer.reducer_number=4
+
+mapreduce.java_opts=-Xmx512m
\ No newline at end of file