From 25cc35b0e4942e990c01ac6224720e8fe84fd9ae Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 4 Oct 2017 10:44:24 +0200
Subject: bug(#9): Fix interference between experiments

This change fixes the interference of multiple experiments running at
the same time due to some thread unsafe behaviour in the
JpaExperimentManager class.

The code has now been restructured to solve the issue and fix the thread
unsafe behaviour.

Closes #9.
---
 .../src/main/resources/jpa/schema.xml                   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'opendc-integration-jpa/src/main/resources/jpa')

diff --git a/opendc-integration-jpa/src/main/resources/jpa/schema.xml b/opendc-integration-jpa/src/main/resources/jpa/schema.xml
index a14fb96d..bd6ea7a1 100644
--- a/opendc-integration-jpa/src/main/resources/jpa/schema.xml
+++ b/opendc-integration-jpa/src/main/resources/jpa/schema.xml
@@ -85,7 +85,7 @@
 		</attributes>
 	</entity>
 
-	<entity class="Trace" access="FIELD" name="traces">
+	<entity class="Trace" access="FIELD" name="traces" cacheable="false">
 		<attributes>
 			<id name="id" />
 			<basic name="name">
@@ -97,17 +97,17 @@
 		</attributes>
 	</entity>
 
-	<entity class="Job" access="FIELD" name="jobs">
+	<entity class="Job" access="FIELD" name="jobs" cacheable="false">
 		<attributes>
 			<id name="id" />
-			<one-to-many name="tasks" target-entity="nl.atlarge.opendc.integration.jpa.schema.Task">
+			<one-to-many name="tasks" target-entity="Task">
 				<join-column name="job_id" />
 			</one-to-many>
 			<transient name="owner" />
 		</attributes>
 	</entity>
 
-	<entity class="Task" access="FIELD" name="tasks">
+	<entity class="Task" access="FIELD" name="tasks" cacheable="false">
 		<convert converter="nl.atlarge.opendc.integration.jpa.converter.ParallelizableConverter" attribute-name="parallelizable" />
 		<attributes>
 			<id name="id" />
@@ -121,13 +121,12 @@
 				<column name="parallelizability" column-definition="text" />
 			</basic>
 
-			<one-to-one name="dependency" target-entity="nl.atlarge.opendc.integration.jpa.schema.Task">
+			<one-to-one name="dependency" target-entity="Task">
 				<join-column name="task_dependency_id" />
 			</one-to-one>
-			<transient name="_dependencies" />
-			<transient name="_remaining" />
-			<transient name="accepted" />
-			<transient name="started" />
+			<transient name="dependencies" />
+			<transient name="state" />
+			<transient name="remaining" />
 			<transient name="finished" />
 		</attributes>
 	</entity>
-- 
cgit v1.2.3