GH-5059 improve error handling and logging

Author: hmottestad

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java

@@ -572,12 +572,14 @@ public void approve(Resource subj, IRI pred, Value obj, Resource ctx) throws Sai
 
 		@Override
 		public void approveAll(Set<Statement> approved, Set<Resource> approvedContexts) {
+			Statement last = null;
 
 			sinkStoreAccessLock.lock();
 			try {
 				startTransaction(true);
 
 				for (Statement statement : approved) {
+					last = statement;
 					Resource subj = statement.getSubject();
 					IRI pred = statement.getPredicate();
 					Value obj = statement.getObject();
@@ -604,13 +606,20 @@ public void approveAll(Set<Statement> approved, Set<Resource> approvedContexts)
 					}
 
 				}
-			} catch (IOException e) {
+			} catch (IOException | RuntimeException e) {
 				rollback();
+				if (multiThreadingActive) {
+					logger.error("Encountered an unexpected problem while trying to add a statement.", e);
+				} else {
+					logger.error(
+							"Encountered an unexpected problem while trying to add a statement. Last statement that was attempted to be added: [ {} ]",
+							last, e);
+				}
+
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException) e;
+				}
 				throw new SailException(e);
-			} catch (RuntimeException e) {
-				rollback();
-				logger.error("Encountered an unexpected problem while trying to add a statement", e);
-				throw e;
 			} finally {
 				sinkStoreAccessLock.unlock();
 			}

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbUtil.java

@@ -16,6 +16,7 @@
 
 import static org.lwjgl.system.MemoryStack.stackPush;
 import static org.lwjgl.system.MemoryUtil.NULL;
+import static org.lwjgl.util.lmdb.LMDB.MDB_DBS_FULL;
 import static org.lwjgl.util.lmdb.LMDB.MDB_KEYEXIST;
 import static org.lwjgl.util.lmdb.LMDB.MDB_NOTFOUND;
 import static org.lwjgl.util.lmdb.LMDB.MDB_RDONLY;
@@ -39,12 +40,16 @@
 import org.lwjgl.system.Pointer;
 import org.lwjgl.util.lmdb.MDBCmpFuncI;
 import org.lwjgl.util.lmdb.MDBVal;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utility class for working with LMDB.
  */
 final class LmdbUtil {
 
+	private static final Logger logger = LoggerFactory.getLogger(LmdbUtil.class);
+
 	/**
 	 * Minimum free space in an LMDB db before automatically resizing the map.
 	 */
@@ -61,7 +66,9 @@ private LmdbUtil() {
 
 	static int E(int rc) throws IOException {
 		if (rc != MDB_SUCCESS && rc != MDB_NOTFOUND && rc != MDB_KEYEXIST) {
-			throw new IOException(mdb_strerror(rc));
+			IOException ioException = new IOException(mdb_strerror(rc));
+			logger.info("Possible LMDB error: {}", mdb_strerror(rc), ioException);
+			throw ioException;
 		}
 		return rc;
 	}

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSet.java

@@ -12,6 +12,7 @@
 
 import static org.eclipse.rdf4j.sail.lmdb.LmdbUtil.E;
 import static org.lwjgl.system.MemoryUtil.NULL;
+import static org.lwjgl.util.lmdb.LMDB.MDB_MAP_FULL;
 import static org.lwjgl.util.lmdb.LMDB.MDB_NEXT;
 import static org.lwjgl.util.lmdb.LMDB.MDB_NOOVERWRITE;
 import static org.lwjgl.util.lmdb.LMDB.MDB_SET;
@@ -24,6 +25,7 @@
 import static org.lwjgl.util.lmdb.LMDB.mdb_del;
 import static org.lwjgl.util.lmdb.LMDB.mdb_drop;
 import static org.lwjgl.util.lmdb.LMDB.mdb_put;
+import static org.lwjgl.util.lmdb.LMDB.mdb_strerror;
 import static org.lwjgl.util.lmdb.LMDB.mdb_txn_abort;
 import static org.lwjgl.util.lmdb.LMDB.mdb_txn_begin;
 
@@ -43,12 +45,16 @@
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.util.lmdb.MDBVal;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A LMDB-based persistent set.
  */
 class PersistentSet<T extends Serializable> extends AbstractSet<T> {
 
+	private static final Logger logger = LoggerFactory.getLogger(PersistentSet.class);
+
 	private PersistentSetFactory<T> factory;
 	private final int dbi;
 	private int size;
@@ -126,15 +132,35 @@ private synchronized boolean update(Object element, boolean add) throws IOExcept
 			keyVal.mv_data(keyBuf);
 
 			if (add) {
-				if (mdb_put(factory.writeTxn, dbi, keyVal, dataVal, MDB_NOOVERWRITE) == MDB_SUCCESS) {
+				int rc = mdb_put(factory.writeTxn, dbi, keyVal, dataVal, MDB_NOOVERWRITE);
+				if (rc == MDB_SUCCESS) {
 					size++;
 					return true;
+				} else if (rc == MDB_MAP_FULL) {
+					factory.ensureResize();
+					if (mdb_put(factory.writeTxn, dbi, keyVal, dataVal, MDB_NOOVERWRITE) == MDB_SUCCESS) {
+						size++;
+						return true;
+					}
+					return false;
+				} else {
+					logger.debug("Failed to add element due to error {}: {}", mdb_strerror(rc), element);
 				}
 			} else {
 				// delete element
-				if (mdb_del(factory.writeTxn, dbi, keyVal, dataVal) == MDB_SUCCESS) {
+				int rc = mdb_del(factory.writeTxn, dbi, keyVal, dataVal);
+				if (rc == MDB_SUCCESS) {
 					size--;
 					return true;
+				} else if (rc == MDB_MAP_FULL) {
+					factory.ensureResize();
+					if (mdb_del(factory.writeTxn, dbi, keyVal, dataVal) == MDB_SUCCESS) {
+						size--;
+						return true;
+					}
+					return false;
+				} else {
+					logger.debug("Failed to remove element due to error {}: {}", mdb_strerror(rc), element);
 				}
 			}
 			return false;