HSEARCH-1562 Race condition in error reporting from IdentifierProducer

Conflicts: engine/src/main/java/org/hibernate/search/util/logging/impl/Log.java
hibernate · Mar 31, 2014 · 1fffa98 · 1fffa98
1 parent d199fe1
commit 1fffa98
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/engine/src/main/java/org/hibernate/search/util/logging/impl/Log.java b/engine/src/main/java/org/hibernate/search/util/logging/impl/Log.java
@@ -760,4 +760,8 @@ public interface Log extends BasicLogger {
 
 	@Message(id = 194, value = "Unable to load configured class '%s' as 'sharding_strategy'")
 	SearchException getUnableToLoadShardingStrategyClassException(String className);
+
+	@Message(id = 211, value = "An exception occurred while the MassIndexer was fetching the primary identifiers list")
+	String massIndexerExceptionWhileFetchingIds();
+
 }
diff --git a/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java b/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java
@@ -62,6 +62,7 @@ public class IdentifierProducer implements StatelessSessionAwareRunnable {
 	private final MassIndexerProgressMonitor monitor;
 	private final long objectsLimit;
 	private final int idFetchSize;
+	private final ErrorHandler errorHandler;
 
 	/**
 	 * @param fromIdentifierListToEntities the target queue where the produced identifiers are sent to
@@ -84,6 +85,7 @@ public IdentifierProducer(
 				this.indexedType = indexedType;
 				this.monitor = monitor;
 				this.objectsLimit = objectsLimit;
+				this.errorHandler = errorHandler;
 				this.idFetchSize = idFetchSize;
 				log.trace( "created" );
 	}
@@ -94,6 +96,9 @@ public void run(StatelessSession upperSession) throws Exception {
 		try {
 			inTransactionWrapper( upperSession );
 		}
+		catch (Exception exception) {
+			errorHandler.handleException( log.massIndexerExceptionWhileFetchingIds(), exception );
+		}
 		finally {
 			destination.producerStopping();
 		}

diff --git a/orm/src/test/java/org/hibernate/search/test/batchindexing/FetchSizeConfigurationTest.java b/orm/src/test/java/org/hibernate/search/test/batchindexing/FetchSizeConfigurationTest.java
@@ -55,7 +55,7 @@ public void testSetFetchSizeOnH2Fails() throws InterruptedException {
 
 		getSession().close();
 		String errorMessage = mockErrorHandler.getErrorMessage();
-		Assert.assertEquals( "HSEARCH000116: Unexpected error during MassIndexer operation", errorMessage );
+		Assert.assertEquals( "HSEARCH000211: An exception occurred while the MassIndexer was fetching the primary identifiers list", errorMessage );
 		Throwable exception = mockErrorHandler.getLastException();
 		Assert.assertTrue( exception instanceof org.hibernate.exception.GenericJDBCException );
 	}