Unbind an instance from the cluster.

Embed the non-writable directory in the CannotWriteException for sane debugging.
neo4j · Oct 20, 2016 · 2ac4646 · 2ac4646
1 parent d975153
commit 2ac4646
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/CannotWriteException.java
@@ -19,10 +19,14 @@
  */
 package org.neo4j.commandline.dbms;
 
-public class CannotWriteException extends Exception
+import java.nio.file.Path;
+
+import static java.lang.String.format;
+
+class CannotWriteException extends Exception
 {
-    public CannotWriteException( String message )
+    CannotWriteException( Path file )
     {
-        super(message);
+        super( format("Could not write to: %s", file.toAbsolutePath().toString() ));
     }
 }
diff --git a/community/dbms/src/main/java/org/neo4j/commandline/dbms/StoreLockChecker.java b/community/dbms/src/main/java/org/neo4j/commandline/dbms/StoreLockChecker.java
@@ -27,9 +27,9 @@
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.internal.StoreLocker;
 
-public class StoreLockChecker
+class StoreLockChecker
 {
-    public Closeable withLock( Path databaseDirectory ) throws CommandFailed, CannotWriteException
+    Closeable withLock( Path databaseDirectory ) throws CommandFailed, CannotWriteException
     {
         Path lockFile = databaseDirectory.resolve( StoreLocker.STORE_LOCK_FILENAME );
         if ( Files.exists( lockFile ) )
@@ -44,7 +44,7 @@ public Closeable withLock( Path databaseDirectory ) throws CommandFailed, Cannot
             }
             else
             {
-                throw new CannotWriteException( "Store is not writable. Check permissions and try again." );
+                throw new CannotWriteException( lockFile );
             }
         }
         return () ->