kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复旧版本TID，造成入库程序死循环锁死的问题。 

2.更新一个health report的说明。
This commit is contained in:
wusheng 2016-02-25 16:41:44 +08:00
parent a06571d9fb
commit 1727832f78
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/Chain.java
View File

@ -23,7 +23,7 @@ public class Chain {
break;
} catch (Throwable e) {
ServerHealthCollector.getCurrentHeathReading("storage-chain").updateData(ServerHeathReading.ERROR,
"Failed to do chain action.Cause:" + e.getMessage());
"Failed to do chain action. spans list hash code:" + spans.hashCode() + ",Cause:" + e.getMessage());
}
}
}

9
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java
View File

@ -7,6 +7,7 @@ import com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading;
import com.ai.cloud.skywalking.reciever.storage.Chain;
import com.ai.cloud.skywalking.reciever.storage.ChainException;
import com.ai.cloud.skywalking.reciever.storage.IStorageChain;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.*;
@ -14,6 +15,7 @@ import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.mortbay.log.Log;
import java.io.IOException;
import java.util.ArrayList;
@ -101,7 +103,12 @@ public class SaveToHBaseChain implements IStorageChain {
}
private static long getTSBySpanTraceId(Span span) {
return Long.parseLong(span.getTraceId().split("\\.")[2]);
try{
return Long.parseLong(span.getTraceId().split("\\.")[2]);
}catch(Throwable t){
Log.warn("can't get timestamp from trace id:" + span.getTraceId() + ", going to use current timestamp.");
return System.currentTimeMillis();
}
}
private static void bulkInsertBuriedPointData(String tableName, List<Put> data) {