You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/05/23 07:47:26 UTC
[incubator-skywalking] branch master updated: #1204 (#1259)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 2502ea2 #1204 (#1259)
2502ea2 is described below
commit 2502ea29619aea777ced1f608e1013972e56ea8d
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Wed May 23 15:47:21 2018 +0800
#1204 (#1259)
Add folder lock to collector's buffer folder.
---
.../parser/provider/buffer/SegmentBufferManager.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
index d7add8e..09fc97c 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.buffer;
import java.io.*;
+import java.nio.channels.FileLock;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.*;
import org.apache.skywalking.apm.network.proto.UpstreamSegment;
@@ -40,11 +41,14 @@ public enum SegmentBufferManager {
try {
OffsetManager.INSTANCE.initialize();
if (new File(BufferFileConfig.BUFFER_PATH).mkdirs()) {
+ tryLock();
newDataFile();
} else if (BufferFileConfig.BUFFER_FILE_CLEAN_WHEN_RESTART) {
deleteFiles();
+ tryLock();
newDataFile();
} else {
+ tryLock();
String writeFileName = OffsetManager.INSTANCE.getWriteFileName();
if (StringUtils.isNotEmpty(writeFileName)) {
File dataFile = new File(BufferFileConfig.BUFFER_PATH + writeFileName);
@@ -77,6 +81,21 @@ public enum SegmentBufferManager {
}
}
+ private void tryLock() {
+ logger.info("try to lock buffer directory.");
+ FileLock lock = null;
+
+ try {
+ lock = new FileOutputStream(BufferFileConfig.BUFFER_PATH + "lock").getChannel().tryLock();
+ } catch (IOException e) {
+ logger.error(e.getMessage(), e);
+ }
+
+ if (lock == null) {
+ throw new RuntimeException("The buffer directory is reading or writing by another thread.");
+ }
+ }
+
private void newDataFile() throws IOException {
logger.debug("getOrCreate new segment buffer file");
String timeBucket = String.valueOf(TimeBucketUtils.INSTANCE.getSecondTimeBucket(System.currentTimeMillis()));
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.