/*
 * Copyright 2015-2016 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.glowroot.agent.fat.init;

import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileLock;

import com.google.common.io.Files;

import static com.google.common.base.Preconditions.checkNotNull;

public class DataDirLocking {

    private DataDirLocking() {}

    static Closeable lockDataDir(File baseDir) throws Exception {
        // lock data dir
        File tmpDir = new File(baseDir, "tmp");
        File lockFile = new File(tmpDir, ".lock");
        try {
            Files.createParentDirs(lockFile);
            Files.touch(lockFile);
        } catch (IOException e) {
            throw new BaseDirLockedException(e);
        }
        final RandomAccessFile baseDirLockFile = new RandomAccessFile(lockFile, "rw");
        final FileLock baseDirFileLock = baseDirLockFile.getChannel().tryLock();
        if (baseDirFileLock == null) {
            throw new BaseDirLockedException();
        }
        lockFile.deleteOnExit();
        return new Closeable() {
            @Override
            public void close() throws IOException {
                checkNotNull(baseDirFileLock);
                baseDirFileLock.release();
                baseDirLockFile.close();
            }
        };
    }

    @SuppressWarnings("serial")
    public static class BaseDirLockedException extends Exception {

        private BaseDirLockedException() {
            super();
        }

        private BaseDirLockedException(Throwable cause) {
            super(cause);
        }
    }
}

@@ -1434,22 +1434,16 @@
     
-final 
 FileLock
  bas
@@ -1438,16 +1438,246 @@
 FileLock
+ baseDirFileLock = baseDirLockFile.getChannel().tryLock();%0A        if (baseDirFileLock == null) %7B%0A            // try again in case there is O/S lag on releasing prior lock on JVM restart%0A            Thread.sleep(1000);%0A           
  baseDir
@@ -1719,32 +1719,36 @@
 el().tryLock();%0A
+    
         if (base
@@ -1774,32 +1774,36 @@
 ) %7B%0A            
+   
+ 
 throw new BaseDi
@@ -1818,24 +1818,38 @@
 xception();%0A
+            %7D%0A
         %7D%0A  
@@ -1875,24 +1875,87 @@
 teOnExit();%0A
+        final FileLock baseDirFileLockFinal = baseDirFileLock;%0A
         retu
@@ -2094,16 +2094,21 @@
 FileLock
+Final
 );%0A     
@@ -2133,16 +2133,21 @@
 FileLock
+Final
 .release

Fix sporadic locked data dir error on startup