and fix a meta locking bug the CI found

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

@@ -1395,6 +1395,7 @@ public class Database implements DataHandler {
                     if (!readOnly) {
                         lockMeta(pageStore.getPageStoreSession());
                         pageStore.compact(compactMode);
+                        unlockMeta(pageStore.getPageStoreSession());
                     }
                 } catch (DbException e) {
                     if (SysProperties.CHECK2) {

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

@@ -856,10 +856,11 @@ public class Session extends SessionWithState {
 
                 removeTemporaryLobs(false);
                 cleanTempTables(true);
-                // sometimes Table#removeChildrenAndResources
-                // will take the meta lock
-                database.unlockMeta(this);
                 undoLog.clear();
+                // Table#removeChildrenAndResources can take the meta lock,
+                // and we need to unlock before we call removeSession(), which might
+                // want to take the meta lock using the system session.
+                database.unlockMeta(this);
                 database.removeSession(this);
             } finally {
                 closed = true;