Changeset 8326 for branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

07/25/12 14:12:47 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added IConnectionProvider interface + implementation based on jheinzelreiters transaction management
• Fixed transaction being promoted to dtc; transactions enabled again
• Changed HiveDao: transactions are managed properly

File:

• branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (11 diffs)

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -28 +28 @@
 using DA = HeuristicLab.Services.Hive.DataAccess;
 using DT = HeuristicLab.Services.Hive.DataTransfer;
+using System.Transactions;
 
 
@@ -63 +64 @@
     public Guid AddTask(Task task, TaskData taskData, IEnumerable<Guid> resourceIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      Guid currentUserId = userManager.CurrentUserId;
       return trans.UseTransaction(() => {
         task.Id = dao.AddTask(task);
@@ -71 +73 @@
         }
         dao.AddTaskData(taskData);
-        dao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, userManager.CurrentUserId, null);
+        dao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, currentUserId, null);
         return taskData.TaskId;
       }, false, true);
@@ -181 +183 @@
 
     public Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception) {
-      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      author.AuthorizeForTask(taskId, Permission.Full);
+      using (var ts = new TransactionScope(TransactionScopeOption.Suppress)) {
+        authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
+        author.AuthorizeForTask(taskId, Permission.Full);
+      }
       return trans.UseTransaction(() => {
         Task task = dao.UpdateTaskState(taskId, DataTransfer.Convert.ToEntity(taskState), slaveId, userId, exception);
@@ -245 +249 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForTask(taskId, Permission.Full);
-      trans.UseTransaction(() => {
-        Task task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, userManager.CurrentUserId, string.Empty);
+      Guid currentUserId = userManager.CurrentUserId;
+      trans.UseTransaction(() => {
+        Task task = dao.UpdateTaskState(taskId, DA.TaskState.Waiting, null, currentUserId, string.Empty);
         task.Command = null;
         dao.UpdateTask(task);
@@ -320 +325 @@
     public void GrantPermission(Guid jobId, Guid grantedUserId, Permission permission) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      Guid currentUserId = userManager.CurrentUserId;
       trans.UseTransaction(() => {
         Job job = dao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        Permission perm = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, userManager.CurrentUserId));
+        Permission perm = DT.Convert.ToDto(dao.GetPermissionForJob(job.Id, currentUserId));
         if (perm != Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DT.Convert.ToEntity(permission));
+        dao.SetJobPermission(jobId, currentUserId, grantedUserId, DT.Convert.ToEntity(permission));
       });
     }
@@ -331 +337 @@
     public void RevokePermission(Guid jobId, Guid grantedUserId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      Guid currentUserId = userManager.CurrentUserId;
       trans.UseTransaction(() => {
         Job job = dao.GetJob(jobId);
         if (job == null) throw new FaultException<FaultReason>(new FaultReason("Could not find task with id " + jobId));
-        DA.Permission perm = dao.GetPermissionForJob(job.Id, userManager.CurrentUserId);
+        DA.Permission perm = dao.GetPermissionForJob(job.Id, currentUserId);
         if (perm != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permissions for this experiment"));
-        dao.SetJobPermission(jobId, userManager.CurrentUserId, grantedUserId, DA.Permission.NotAllowed);
+        dao.SetJobPermission(jobId, currentUserId, grantedUserId, DA.Permission.NotAllowed);
       });
     }
@@ -342 +349 @@
     public IEnumerable<JobPermission> GetJobPermissions(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
-        DA.Permission currentUserPermission = dao.GetPermissionForJob(jobId, userManager.CurrentUserId);
+      Guid currentUserId = userManager.CurrentUserId;
+      return trans.UseTransaction(() => {
+        DA.Permission currentUserPermission = dao.GetPermissionForJob(jobId, currentUserId);
         if (currentUserPermission != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this experiment"));
         return dao.GetJobPermissions(x => x.JobId == jobId);
@@ -421 +429 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       return trans.UseTransaction(() => {
-        plugin.UserId = userManager.CurrentUserId;
+        using (var ts = new TransactionScope(TransactionScopeOption.Suppress)) {
+          plugin.UserId = userManager.CurrentUserId;
+        }
         plugin.DateCreated = DateTime.Now;
 
@@ -476 +486 @@
     public void GrantResourcePermissions(Guid resourceId, Guid[] grantedUserIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      Guid currentUserId = userManager.CurrentUserId;
       trans.UseTransaction(() => {
         Resource resource = dao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
-        if (resource.OwnerUserId != userManager.CurrentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permission for this resource"));
+        if (resource.OwnerUserId != currentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to grant permission for this resource"));
         foreach (Guid id in grantedUserIds)
-          dao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = userManager.CurrentUserId, GrantedUserId = id });
+          dao.AddResourcePermission(new ResourcePermission { ResourceId = resourceId, GrantedByUserId = currentUserId, GrantedUserId = id });
       });
     }
@@ -487 +498 @@
     public void RevokeResourcePermissions(Guid resourceId, Guid[] grantedUserIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      Guid currentUserId = userManager.CurrentUserId;
       trans.UseTransaction(() => {
         Resource resource = dao.GetResource(resourceId);
         if (resource == null) throw new FaultException<FaultReason>(new FaultReason("Could not find resource with id " + resourceId));
-        if (resource.OwnerUserId != userManager.CurrentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to revoke permission for this resource"));
+        if (resource.OwnerUserId != currentUserId && !authen.IsInRole(HiveRoles.Administrator)) throw new FaultException<FaultReason>(new FaultReason("Not allowed to revoke permission for this resource"));
         foreach (Guid id in grantedUserIds)
           dao.DeleteResourcePermission(resourceId, id);