Merge pull request #776 from Fedict/issues/#535-sailbase-timeout

Fix #535: Made timeout configurable

Author: Jeen Broekstra

core/sail/api/src/main/java/org/eclipse/rdf4j/sail/config/AbstractSailImplConfig.java

@@ -27,6 +27,7 @@ public abstract class AbstractSailImplConfig implements SailImplConfig {
 	private String type;
 
 	private long iterationCacheSyncThreshold;
+	private long connectionTimeOut;
 
 	/**
 	 * Create a new RepositoryConfigImpl.
@@ -71,6 +72,10 @@ public Resource export(Model m) {
 					vf.createLiteral(iterationCacheSyncThreshold));
 		}
 
+		if (connectionTimeOut > 0) {
+			m.add(implNode, SailConfigSchema.CONNECTION_TIME_OUT,
+					vf.createLiteral(connectionTimeOut));
+		}
 		return implNode;
 	}
 
@@ -83,6 +88,9 @@ public void parse(Model m, Resource implNode)
 			Models.objectLiteral(
 					m.filter(implNode, SailConfigSchema.ITERATION_CACHE_SYNC_THRESHOLD, null)).ifPresent(
 							lit -> setIterationCacheSyncThreshold(lit.longValue()));
+			Models.objectLiteral(
+					m.filter(implNode, SailConfigSchema.CONNECTION_TIME_OUT, null)).ifPresent(
+							lit -> setConnectionTimeOut(lit.longValue()));
 		}
 		catch (ModelException e) {
 			throw new SailConfigException(e.getMessage(), e);
@@ -103,4 +111,22 @@ public long getIterationCacheSyncThreshold() {
 	public void setIterationCacheSyncThreshold(long iterationCacheSyncThreshold) {
 		this.iterationCacheSyncThreshold = iterationCacheSyncThreshold;
 	}
+	
+	/**
+	 * Get the connection timeout (in ms).
+	 * 
+	 * @return connection timeout (in ms)
+	 */
+	public long getConnectionTimeOut() {
+		return connectionTimeOut;
+	}
+
+	/**
+	 * Set the connection timeout (in ms).
+	 * 
+	 * @param connectionTimeOut timeout (in ms)
+	 */
+	public void setConnectionTimeOut(long connectionTimeOut) {
+		this.connectionTimeOut = connectionTimeOut;
+	}
 }

core/sail/api/src/main/java/org/eclipse/rdf4j/sail/config/SailConfigSchema.java

@@ -32,10 +32,15 @@ public class SailConfigSchema {
 	/** <tt>http://www.openrdf.org/config/sail#iterationCacheSyncTreshold</tt> */
 	public final static IRI ITERATION_CACHE_SYNC_THRESHOLD;
 
+	/** <tt>http://www.openrdf.org/config/sail#connectionTimeOut</tt> */
+	public final static IRI CONNECTION_TIME_OUT;
+	
+
 	static {
 		ValueFactory factory = SimpleValueFactory.getInstance();
 		SAILTYPE = factory.createIRI(NAMESPACE, "sailType");
 		DELEGATE = factory.createIRI(NAMESPACE, "delegate");
 		ITERATION_CACHE_SYNC_THRESHOLD = factory.createIRI(NAMESPACE, "iterationCacheSyncTreshold");
+		CONNECTION_TIME_OUT = factory.createIRI(NAMESPACE, "connectionTimeOut");
 	}
 }

core/sail/api/src/main/java/org/eclipse/rdf4j/sail/helpers/AbstractSail.java

@@ -130,6 +130,15 @@ public AbstractSail() {
 	 * Methods *
 	 *---------*/
 
+	/**
+	 * Set connection timeout on shutdown (in ms).
+	 * 
+	 * @param connectionTimeOut timeout (in ms)
+	 */
+	public void setConnectionTimeOut(long connectionTimeOut) {
+		this.connectionTimeOut = connectionTimeOut;
+	}
+
 	@Override
 	public void setDataDir(File dataDir) {
 		if (isInitialized()) {
@@ -212,7 +221,7 @@ public void shutDown()
 				if (!activeConnections.isEmpty()) {
 					logger.debug("Waiting for active connections to close before shutting down...");
 					try {
-						activeConnections.wait(DEFAULT_CONNECTION_TIMEOUT);
+						activeConnections.wait(connectionTimeOut);
 					}
 					catch (InterruptedException e) {
 						// ignore and continue