[GitHub] peng-yongsheng closed pull request #1970: fix 5.x too many open files

[GitBox <gi...@apache.org>]

peng-yongsheng closed pull request #1970: fix 5.x too many open files
URL: https://github.com/apache/incubator-skywalking/pull/1970
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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/OffsetManager.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/OffsetManager.java
index 67c162e52..4f693d0ec 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/OffsetManager.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/OffsetManager.java
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.RandomAccessFile;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import org.apache.skywalking.apm.collector.core.util.CollectionUtils;
@@ -44,7 +43,6 @@
     private File offsetFile;
     private Offset offset;
     private boolean initialized = false;
-    private RandomAccessFile randomAccessFile = null;
     private String lastOffsetRecord = Const.EMPTY_STRING;
 
     public synchronized void initialize() throws IOException {
@@ -95,7 +93,7 @@ public void flush() {
             if (offsetFile.length() >= BufferFileConfig.BUFFER_OFFSET_MAX_FILE_SIZE) {
                 nextFile();
             }
-            FileUtils.INSTANCE.writeAppendToLast(offsetFile, randomAccessFile, offsetRecord);
+            FileUtils.INSTANCE.writeAppendToLast(offsetFile, offsetRecord);
             lastOffsetRecord = offsetRecord;
         }
     }
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 45e09aa6d..5c4d013d9 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
@@ -55,6 +55,9 @@ public synchronized void initialize(ModuleManager moduleManager) {
                 if (StringUtils.isNotEmpty(writeFileName)) {
                     File dataFile = new File(BufferFileConfig.BUFFER_PATH + writeFileName);
                     if (dataFile.exists()) {
+                        if (outputStream != null) {
+                            outputStream.close();
+                        }
                         outputStream = new FileOutputStream(new File(BufferFileConfig.BUFFER_PATH + writeFileName), true);
                     } else {
                         newDataFile();
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
index 3a75fd8f1..88036709a 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
@@ -19,7 +19,6 @@
 package org.apache.skywalking.apm.collector.core.util;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import org.slf4j.Logger;
@@ -68,21 +67,24 @@ public String readLastLine(File file) {
         return Const.EMPTY_STRING;
     }
 
-    public void writeAppendToLast(File file, RandomAccessFile randomAccessFile, String value) {
-        if (randomAccessFile == null) {
-            try {
-                randomAccessFile = new RandomAccessFile(file, "rwd");
-            } catch (FileNotFoundException e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
+    public void writeAppendToLast(File file, String value) {
+        RandomAccessFile randomAccessFile = null;
         try {
+            randomAccessFile = new RandomAccessFile(file, "rwd");
             long length = randomAccessFile.length();
             randomAccessFile.seek(length);
             randomAccessFile.writeBytes(System.lineSeparator());
             randomAccessFile.writeBytes(value);
         } catch (IOException e) {
             logger.error(e.getMessage(), e);
+        } finally {
+            if (randomAccessFile != null) {
+                try {
+                    randomAccessFile.close();
+                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
         }
     }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services