Fixes OpenHFT#48

dpisklov · dpisklov · commit bb4df0c35ca3 · 2018-09-11T11:50:55.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/lockchecker/FileBasedLockChecker.java b/affinity/src/main/java/net/openhft/affinity/lockchecker/FileBasedLockChecker.java
@@ -38,6 +38,8 @@ public boolean obtainLock(int id, String metaInfo) throws IOException {
         try (Writer writer = new BufferedWriter(new OutputStreamWriter(
                 new FileOutputStream(file, false), "utf-8"))) {
             writer.write(metaInfo + "\n" + df.format(new Date()));
+            file.setWritable(true, false);
+            file.setExecutable(false, false);
             return true;
         }
     }
diff --git a/affinity/src/main/java/net/openhft/affinity/lockchecker/FileLockBasedLockChecker.java b/affinity/src/main/java/net/openhft/affinity/lockchecker/FileLockBasedLockChecker.java
@@ -11,9 +11,13 @@
 import java.nio.channels.OverlappingFileLockException;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 
+import static java.nio.file.StandardOpenOption.*;
 import static net.openhft.affinity.impl.VanillaCpuLayout.MAX_CPUS_SUPPORTED;
 
 /**
@@ -54,7 +58,7 @@ private boolean isLockFree(File file, int id) {
 
         //does another process have the lock?
         try {
-            FileChannel fc = FileChannel.open(file.toPath(), StandardOpenOption.WRITE);
+            FileChannel fc = FileChannel.open(file.toPath(), WRITE);
             FileLock fileLock = fc.tryLock();
             if (fileLock == null) {
                 return false;
@@ -77,8 +81,9 @@ public boolean obtainLock(int id, String metaInfo) throws IOException {
             return false;
         }
 
-        FileChannel fc = FileChannel.open(file.toPath(), StandardOpenOption.CREATE_NEW,
-                StandardOpenOption.WRITE, StandardOpenOption.READ, StandardOpenOption.SYNC);
+        FileChannel fc = FileChannel.open(file.toPath(),
+                new HashSet<>(Arrays.asList(CREATE_NEW, WRITE, READ, SYNC)),
+                PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-rw-rw-")));
         FileLock fl = fc.tryLock();
 
         if(fl == null) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public boolean obtainLock(int id, String metaInfo) throws IOException {`
`38`	`38`	`try (Writer writer = new BufferedWriter(new OutputStreamWriter(`
`39`	`39`	`new FileOutputStream(file, false), "utf-8"))) {`
`40`	`40`	`writer.write(metaInfo + "\n" + df.format(new Date()));`
	`41`	`+ file.setWritable(true, false);`
	`42`	`+ file.setExecutable(false, false);`
`41`	`43`	`return true;`
`42`	`44`	`}`
`43`	`45`	`}`