Commit a0213b9b authored by zhang.xin's avatar zhang.xin
Browse files

1.修复AnalysisMode传递问题

parent 670b5f8f

skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class AnalysisServerDriver extends Configured implements Tool { 
    public int run(String[] args) throws Exception {

        ConfigInitializer.initialize();

        Configuration conf = new Configuration();

        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);

        String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
@@ -62,6 +63,7 @@ public class AnalysisServerDriver extends Configured implements Tool { 


        Job job = Job.getInstance(conf);

        job.setJarByClass(AnalysisServerDriver.class);



        Scan scan = buildHBaseScan(args);



        TableMapReduceUtil.initTableMapperJob(HBaseTableMetaData.TABLE_CALL_CHAIN.TABLE_NAME, scan, ChainBuildMapper.class,

skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildReducer.java

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.ai.cloud.skywalking.analysis.chainbuild; 
import com.ai.cloud.skywalking.analysis.chainbuild.entity.CallChainTree;

import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainInfo;

import com.ai.cloud.skywalking.analysis.chainbuild.po.SpecificTimeCallTreeMergedChainIdContainer;

import com.ai.cloud.skywalking.analysis.config.Config;

import com.ai.cloud.skywalking.analysis.config.ConfigInitializer;

import com.google.gson.Gson;

import org.apache.hadoop.hbase.util.Bytes;
@@ -22,6 +23,10 @@ public class ChainBuildReducer extends Reducer<Text, Text, Text, IntWritable> { 
    protected void setup(Context context) throws IOException,

            InterruptedException {

        ConfigInitializer.initialize();

        Config.AnalysisServer.IS_ACCUMULATE_MODE = Boolean.parseBoolean(context.getConfiguration()

                .get("skywalking.analysis.mode", "false"));

        logger.info("Skywalking analysis mode :[{}]",

                Config.AnalysisServer.IS_ACCUMULATE_MODE ? "ACCUMULATE" : "REWRITE");

    }



    @Override