Changeset 6431 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

06/16/11 14:20:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed Log to ThreadSafeLog
• added license information to all files
• added assembly descriptions
• using blocks before namespace
• made TransactionManager static
• removed DaoException
• removed TimeSpanExtensions
• renamed prepareHiveDatabase.sql should be renamed to Prepare Hive Database.sql
• created Initialize Hive Database.sql

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLabServicesHivePlugin.cs.frame (modified) (1 diff)
• HiveService.cs (modified) (33 diffs)
• Interfaces/IServiceLocator.cs (modified) (1 diff)
• LifecycleManager.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• ServiceLocator.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9 +30 @@
     private DataAccess.IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
-    }
-    private HeuristicLab.Services.Hive.DataAccess.TransactionManager trans {
-      get { return ServiceLocator.Instance.TransactionManager; }
     }
     private IAuthorizationManager auth {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLabServicesHivePlugin.cs.frame

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +27 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
+using DA = HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive {
@@ -18 +40 @@
       get { return ServiceLocator.Instance.HiveDao; }
     }
-    private HeuristicLab.Services.Hive.DataAccess.TransactionManager trans {
-      get { return ServiceLocator.Instance.TransactionManager; }
-    }
     private IAuthenticationManager authen {
       get { return ServiceLocator.Instance.AuthenticationManager; }
@@ -37 +56 @@
     public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         job.Id = dao.AddJob(job);
         jobData.JobId = job.Id;
@@ -52 +71 @@
     public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         job.ParentJobId = parentJobId;
         return AddJob(job, jobData, dao.GetAssignedResources(parentJobId).Select(x => x.Id));
@@ -90 +109 @@
     public void UpdateJob(Job job) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.UpdateJob(job);
       });
@@ -97 +116 @@
     public void UpdateJobData(Job job, JobData jobData) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      //trans.UseTransaction(() => { // cneumuel: try without transaction
+      //DA.TransactionManager.UseTransaction(() => { // cneumuel: try without transaction
       jobData.LastUpdate = DateTime.Now;
       dao.UpdateJob(job);
@@ -106 +125 @@
     public void DeleteJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.DeleteJob(jobId);
       });
@@ -113 +132 @@
     public void DeleteChildJobs(Guid parentJobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var jobs = GetChildJobs(parentJobId, true, false);
         foreach (var job in jobs) {
@@ -124 +143 @@
     public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         Job job = dao.UpdateJobState(jobId, jobState, slaveId, userId, exception);
 
@@ -147 +166 @@
     public void StopJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var job = dao.GetJob(jobId);
         if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
@@ -162 +181 @@
     public void PauseJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var job = dao.GetJob(jobId);
         if (job.State == JobState.Calculating || job.State == JobState.Transferring) {
@@ -175 +194 @@
     public void RestartJob(Guid jobId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         Job job = dao.UpdateJobState(jobId, JobState.Waiting, null, author.UserId, string.Empty);
         job.Command = null;
@@ -204 +223 @@
     public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         hiveExperimentDto.OwnerUserId = author.UserId;
         hiveExperimentDto.DateCreated = DateTime.Now;
@@ -213 +232 @@
     public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.UpdateHiveExperiment(hiveExperimentDto);
       });
@@ -220 +239 @@
     public void DeleteHiveExperiment(Guid hiveExperimentId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         HiveExperiment he = dao.GetHiveExperiment(hiveExperimentId);
         dao.DeleteHiveExperiment(hiveExperimentId); // child jobs will be deleted by db-trigger
@@ -230 +249 @@
     public void Hello(Slave slaveInfo) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var slave = dao.GetSlave(slaveInfo.Id);
 
@@ -261 +280 @@
     public void GoodBye(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var slave = dao.GetSlave(slaveId);
         if (slave != null) {
@@ -275 +294 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
       TriggerLifecycle(false);
-      return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+      return DA.TransactionManager.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
     }
     #endregion
@@ -282 +301 @@
     public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         plugin.UserId = author.UserId;
         plugin.DateCreated = DateTime.Now;
@@ -315 +334 @@
       List<PluginData> pluginDatas = new List<PluginData>();
 
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         foreach (Guid guid in pluginIds) {
           pluginDatas.AddRange(dao.GetPluginDatas(x => x.PluginId == guid).ToList());
@@ -328 +347 @@
     public Guid AddSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dao.AddSlave(slave));
+      return DA.TransactionManager.UseTransaction(() => dao.AddSlave(slave));
     }
 
     public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
+      return DA.TransactionManager.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
     }
 
@@ -358 +377 @@
     public void UpdateSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.UpdateSlave(slave);
       });
@@ -365 +384 @@
     public void UpdateSlaveGroup(SlaveGroup slaveGroup) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.UpdateSlaveGroup(slaveGroup);
       });
@@ -372 +391 @@
     public void DeleteSlave(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.DeleteSlave(slaveId);
       });
@@ -379 +398 @@
     public void DeleteSlaveGroup(Guid slaveGroupId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.DeleteSlaveGroup(slaveGroupId);
       });
@@ -386 +405 @@
     public void AddResourceToGroup(Guid slaveGroupId, Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = slaveGroupId;
@@ -395 +414 @@
     public void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         var resource = dao.GetResource(resourceId);
         resource.ParentResourceId = null;
@@ -404 +423 @@
     public Guid GetResourceId(string resourceName) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
+      return DA.TransactionManager.UseTransaction(() => {
         var resource = dao.GetResources(x => x.Name == resourceName).FirstOrDefault();
         if (resource != null) {
@@ -416 +435 @@
     public void TriggerLifecycle(bool force) {
       // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
         if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
@@ -446 +465 @@
     public Guid AddAppointment(Appointment appointment) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => dao.AddAppointment(appointment));
+      return DA.TransactionManager.UseTransaction(() => dao.AddAppointment(appointment));
     }
 
     public void DeleteAppointment(Guid appointmentId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.DeleteAppointment(appointmentId);
       });
@@ -458 +477 @@
     public void UpdateAppointment(Appointment appointment) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      trans.UseTransaction(() => {
+      DA.TransactionManager.UseTransaction(() => {
         dao.UpdateAppointment(appointment);
       });
@@ -465 +484 @@
     public IEnumerable<Appointment> GetScheduleForResource(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
+      return DA.TransactionManager.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
     }
 
     public IEnumerable<Job> GetJobsByResourceId(Guid resourceId) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
-      return trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
+      return DA.TransactionManager.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs

@@ -28 +28 @@
     IHiveDao HiveDao { get; }
     ILifecycleManager LifecycleManager { get; }
-    TransactionManager TransactionManager { get; }
     HeartbeatManager HeartbeatManager { get; }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs

@@ -33 +33 @@
     private DataAccess.IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
-    }
-    private HeuristicLab.Services.Hive.DataAccess.TransactionManager trans {
-      get { return ServiceLocator.Instance.TransactionManager; }
     }
     private IAuthorizationManager auth {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Properties/AssemblyInfo.cs.frame

@@ -7 +7 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("HeuristicLab.Services.Hive")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Business logic for HeuristicLab.Hive services")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs

@@ -1 @@
-using HeuristicLab.Services.Hive.DataAccess;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive {
@@ -18 +39 @@
         if (hiveDao == null) hiveDao = new HiveDao();
         return hiveDao;
-      }
-    }
-    
-    private TransactionManager transactionManager;
-    public TransactionManager TransactionManager {
-      get {
-        if (transactionManager == null) transactionManager = new TransactionManager();
-        return transactionManager;
       }
     }