On out of disk space, the database could get corrupt sometimes, if later write…

On out of disk space, the database could get corrupt sometimes, if later write operations succeeded. Now the file is closed on the first unsuccessful write operation, so that later requests fail consistently. DatabaseEventListener.diskSpaceIsLow() is no longer supported because it can't be guaranteed that it always works correctly.

h2/src/main/org/h2/engine/Database.java

@@ -1198,8 +1198,11 @@ public class Database implements DataHandler {
                         pageStore.compact(compactMode);
                     }
                 } catch (DbException e) {
-                    if (e.getErrorCode() != ErrorCode.DATABASE_IS_CLOSED) {
                     if (SysProperties.CHECK2) {
+                        int code = e.getErrorCode();
+                        if (code != ErrorCode.DATABASE_IS_CLOSED &&
+                                code != ErrorCode.LOCK_TIMEOUT_1 &&
+                                code != ErrorCode.IO_EXCEPTION_2) {
                             e.printStackTrace();
                         }
                     }

h2/src/test/org/h2/test/synth/TestDiskFull.java

@@ -42,7 +42,9 @@ public class TestDiskFull extends TestBase {
     private boolean test(int x) throws SQLException {
         deleteDb("memFS:", null);
         fs.setDiskFullCount(x);
-        String url = "jdbc:h2:unstable:memFS:diskFull;FILE_LOCK=NO;TRACE_LEVEL_FILE=0;WRITE_DELAY=10;LOCK_TIMEOUT=100;CACHE_SIZE=4096";
+        String url = "jdbc:h2:unstable:memFS:diskFull" + x +
+            ";FILE_LOCK=NO;TRACE_LEVEL_FILE=0;WRITE_DELAY=10;" +
+            "LOCK_TIMEOUT=100;CACHE_SIZE=4096";
         Connection conn = null;
         Statement stat = null;
         boolean opened = false;
@@ -72,6 +74,7 @@ public class TestDiskFull extends TestBase {
             if (stat != null) {
                 try {
                     fs.setDiskFullCount(0);
+                    stat.execute("create table if not exists test(id int primary key, name varchar)");
                     stat.execute("insert into test values(4, space(10000))");
                     stat.execute("update test set name='Hallo' where id=3");
                     conn.close();
@@ -100,11 +103,13 @@ public class TestDiskFull extends TestBase {
         }
         fs.setDiskFullCount(0);
         try {
+            conn = null;
             conn = DriverManager.getConnection(url);
         } catch (SQLException e) {
             if (!opened) {
                 return false;
             }
+            throw e;
         }
         stat = conn.createStatement();
         stat.execute("script to 'memFS:test.sql'");

h2/src/test/org/h2/test/utils/FilePathUnstable.java

@@ -156,6 +156,7 @@ class FileUnstable extends FileBase {
 
     private final FilePathUnstable file;
     private final FileChannel channel;
+    private boolean closed;
 
     FileUnstable(FilePathUnstable file, FileChannel channel) {
         this.file = file;
@@ -164,6 +165,7 @@ class FileUnstable extends FileBase {
 
     public void implCloseChannel() throws IOException {
         channel.close();
+        closed = true;
     }
 
     public long position() throws IOException {
@@ -200,6 +202,9 @@ class FileUnstable extends FileBase {
     }
 
     private void checkError() throws IOException {
+        if (closed) {
+            throw new IOException("Closed");
+        }
         file.checkError();
     }