feat: update file listening create file bug (#763)

XiaoMi · Dec 11, 2023 · a7c815f · a7c815f
1 parent b78184c
commit a7c815f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/jcommon/file/pom.xml b/jcommon/file/pom.xml
@@ -9,7 +9,7 @@
         <version>1.4-jdk20-SNAPSHOT</version>
     </parent>
     <artifactId>file</artifactId>
-
+    <version>1.4-jdk21-SNAPSHOT</version>
 
     <dependencies>
 
@@ -26,16 +26,13 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <compilerArgs>
-                        <arg>--add-modules=jdk.incubator.concurrent</arg>
-                        <arg>--enable-preview</arg>
-                    </compilerArgs>
-                    <compilerVersion>20</compilerVersion>
-                    <source>20</source>
-                    <target>20</target>
+                    <compilerVersion>21</compilerVersion>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile2.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile2.java
@@ -79,6 +79,15 @@ public LogFile2(String file) {
         this.pointer = readPointer();
     }
 
+    public LogFile2(String file, long pointer, long lineNumber) {
+        this.file = file;
+        File f = new File(this.file);
+        this.fileKey = FileUtils.fileKey(f);
+        this.md5 = md5(file);
+        this.pointer = pointer;
+        this.lineNumber = lineNumber;
+    }
+
 
     public LogFile2(String file, ReadListener listener, long pointer, long lineNumber) {
         this.file = file;
@@ -114,6 +123,7 @@ public void readLine() throws IOException {
             } catch (Exception e) {
                 log.error("file.length() IOException, file:{}", this.file, e);
             }
+            log.info("rel open file:{},pointer:{}", file, this.pointer);
             raf.seek(pointer);
 
             while (true) {

diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/listener/DefaultMonitorListener.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/listener/DefaultMonitorListener.java
@@ -38,7 +38,7 @@ public void onEvent(FileEvent event) {
             LogFile2 logFile = new LogFile2(event.getFileName());
             pool.submit(() -> {
                 logFile.setListener(new OzHeraReadListener(monitor, logFile, consumer));
-                SafeRun.run(() -> logFile.readLine());
+                SafeRun.run(logFile::readLine);
             });
         }
 
@@ -58,10 +58,12 @@ public void onEvent(FileEvent event) {
 
         if (event.getType().equals(EventType.create)) {
             log.info("create:{}", event.getFileName());
-            LogFile2 logFile = new LogFile2(event.getFileName());
+
+//            LogFile2 logFile = new LogFile2(event.getFileName());
+            LogFile2 logFile = new LogFile2(event.getFileName(), 0, 0);
             pool.submit(() -> {
                 logFile.setListener(new OzHeraReadListener(monitor, logFile, consumer));
-                SafeRun.run(() -> logFile.readLine());
+                SafeRun.run(logFile::readLine);
             });
         }
     }

diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/listener/OzHeraReadListener.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/listener/OzHeraReadListener.java
@@ -49,6 +49,7 @@ public boolean isBreak(String line) {
         if (null == line) {
             HeraFile f = monitor.getMap().get(logFile.getFileKey());
             if (null == f || f.getState().get() == 1) {
+                log.info("file isBreak,file:{},f:{}", logFile.getFile(), f);
                 return true;
             }
         }

diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/ozhera/HeraFileMonitor.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/ozhera/HeraFileMonitor.java
@@ -92,7 +92,6 @@ public void reg(String path, Predicate<String> predicate) throws IOException, In
                 if (!predicate.test(filePath) || modifiedFile.getFileName().toString().startsWith(".")) {
                     continue;
                 }
-                log.debug("epoll result,path:{}", event.kind() + filePath);
                 HeraFile hfile = fileMap.get(filePath);
 
                 if (event.kind() == StandardWatchEventKinds.ENTRY_MODIFY) {
@@ -111,17 +110,20 @@ public void reg(String path, Predicate<String> predicate) throws IOException, In
                 }
 
                 if (event.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
-                    File file = new File(path + "" + modifiedFile.getFileName());
+                    File file = new File(filePath);
                     Object k = FileUtils.fileKey(file);
+
+                    log.info("ENTRY_CREATE filePath:{},fileKey:{}", filePath, k);
+                    HeraFile hf = HeraFile.builder().file(file).fileKey(k).fileName(filePath).build();
+                    map.putIfAbsent(k, hf);
+                    fileMap.put(filePath, hf);
+
                     if (map.containsKey(k)) {
                         log.info("change name " + map.get(k) + "--->" + file);
                         listener.onEvent(FileEvent.builder().fileKey(k).type(EventType.rename).build());
                     } else {
                         listener.onEvent(FileEvent.builder().type(EventType.create).fileName(file.getPath()).build());
                     }
-                    HeraFile hf = HeraFile.builder().file(file).fileKey(k).fileName(filePath).build();
-                    map.putIfAbsent(k, hf);
-                    fileMap.put(filePath, hf);
                 }
             }
             key.reset();
@@ -136,9 +138,9 @@ private HeraFile initFile(File it) {
             if (name.startsWith(".")) {
                 return null;
             }
-            Object fileKey = FileUtils.fileKey(it);
             lock.lock();
             try {
+                Object fileKey = FileUtils.fileKey(it);
                 if (map.containsKey(fileKey)) {
                     return map.get(fileKey);
                 }
@@ -152,6 +154,8 @@ private HeraFile initFile(File it) {
                 fileMap.put(hf.getFileName(), hf);
                 this.listener.onEvent(FileEvent.builder().pointer(pointer).type(EventType.init).fileName(hf.getFileName()).build());
                 return hf;
+            } catch (Exception e) {
+                log.error("init file error,fileName:{}", name, e);
             } finally {
                 lock.unlock();
             }