Changeset 12776

Timestamp:

07/17/15 16:57:22 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive-3.3:

• HiveStatisticsGenerator.cs: Jobs that are deleted are now automatically marked as completed in the hive statistics tables. This was added because when a job got paused and deleted afterwards, it would still show up as ongoing job in the hive statistics.
• Minor changes in NewHiveService.cs

HeuristicLab.Services.WebApp.Statistics-3.3:

• Expired slaves are now shown as offline (previously the last known state was shown)
• Adjusted dialog height

HeuristicLab.Services.WebApp-3.3:

• Changed string.Format to Path.Combine to concate directory paths

Location:

branches/HiveStatistics/sources

Files:

• HeuristicLab 3.3 Services.sln (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/NewHiveService.cs (modified) (17 diffs)
• HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs (modified) (3 diffs)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialog.cshtml (modified) (1 diff)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/PluginManager.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab 3.3 Services.sln

@@ -260 +260 @@
     {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x64.ActiveCfg = Debug|x64
+    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x64.Build.0 = Debug|x64
+    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x86.ActiveCfg = Debug|x86
+    {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Debug|x86.Build.0 = Debug|x86
     {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {3F22B7DA-FDDB-48F0-8BB7-0ABA5120FC87}.Release|Any CPU.Build.0 = Release|Any CPU

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

@@ -134 +134 @@
 
     private void UpdateExistingDimJobs(PersistenceManager pm) {
+      var jobDao = pm.JobDao;
       var dimJobDao = pm.DimJobDao;
       var factTaskDao = pm.FactTaskDao;
@@ -151 +152 @@
         }
         if (totalTasks == completedTasks) {
-          dimJob.DateCompleted = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId) ?? DateTime.Now;
+          var completeDate = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId);
+          if (completeDate == null) {
+            if (jobDao.GetById(dimJob.JobId) == null) {
+              completeDate = DateTime.Now;
+            }
+          }
+          dimJob.DateCompleted = completeDate;
         }
         dimJob.TotalTasks = totalTasks;

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/NewHiveService.cs

@@ -128 +128 @@
     }
 
-    public IEnumerable<Task> GetTasks() {
+    public IEnumerable<DT.Task> GetTasks() {
       // unused
       throw new NotImplementedException();
     }
 
-    public IEnumerable<LightweightTask> GetLightweightTasks(IEnumerable<Guid> taskIds) {
+    public IEnumerable<DT.LightweightTask> GetLightweightTasks(IEnumerable<Guid> taskIds) {
       // unused
       throw new NotImplementedException();
     }
 
-    public IEnumerable<LightweightTask> GetLightweightChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
+    public IEnumerable<DT.LightweightTask> GetLightweightChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
       // unused
       throw new NotImplementedException();
@@ -398 +398 @@
     }
 
-    public IEnumerable<Job> GetAllJobs() {
+    public IEnumerable<DT.Job> GetAllJobs() {
       // unused
       throw new NotImplementedException();
     }
 
-    public Guid AddJob(Job jobDto) {
+    public Guid AddJob(DT.Job jobDto) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       using (var pm = PersistenceManager)
       using (new PerformanceLogger("AddJob")) {
         var jobDao = pm.JobDao;
+        var userPriorityDao = pm.UserPriorityDao;
         return pm.UseTransaction(() => {
           jobDto.OwnerUserId = UserManager.CurrentUserId;
           jobDto.DateCreated = DateTime.Now;
           var job = jobDao.Save(jobDto.ToEntity());
+          if (userPriorityDao.GetById(jobDto.OwnerUserId) == null) {
+            userPriorityDao.Save(new DA.UserPriority {
+              UserId = jobDto.OwnerUserId,
+              DateEnqueued = jobDto.DateCreated
+            });
+          }
           pm.SubmitChanges();
           return job.JobId;
@@ -447 +454 @@
         var jobDao = pm.JobDao;
         pm.UseTransaction(() => {
+          // child task will be deleted by db-trigger
           jobDao.Delete(jobId);
           pm.SubmitChanges();
@@ -546 +554 @@
 
     #region Heartbeat Methods
-    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
+    public List<MessageContainer> Heartbeat(DT.Heartbeat heartbeat) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Slave);
       List<MessageContainer> result = new List<MessageContainer>();
@@ -565 +573 @@
 
     #region Plugin Methods
-    public Plugin GetPlugin(Guid pluginId) {
+    public DT.Plugin GetPlugin(Guid pluginId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       using (var pm = PersistenceManager)
@@ -574 +582 @@
     }
 
-    public Plugin GetPluginByHash(byte[] hash) {
+    public DT.Plugin GetPluginByHash(byte[] hash) {
       // unused
       throw new NotImplementedException();
     }
 
-    public Guid AddPlugin(Plugin plugin, List<PluginData> pluginData) {
+    public Guid AddPlugin(DT.Plugin plugin, List<DT.PluginData> pluginData) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       using (var pm = PersistenceManager)
@@ -593 +601 @@
           pluginEntity = plugin.ToEntity();
           foreach (var data in pluginData) {
-            data.PluginId = default(Guid);
+            data.PluginId = default(Guid); // real id will be assigned from linq2sql
             pluginEntity.PluginData.Add(data.ToEntity());
           }
@@ -603 +611 @@
     }
 
-    public IEnumerable<Plugin> GetPlugins() {
+    public IEnumerable<DT.Plugin> GetPlugins() {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       using (var pm = PersistenceManager)
@@ -616 +624 @@
     }
 
-    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
+    public IEnumerable<DT.PluginData> GetPluginDatas(List<Guid> pluginIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       using (var pm = PersistenceManager)
@@ -668 +676 @@
     }
 
-    public IEnumerable<ResourcePermission> GetResourcePermissions(Guid resourceId) {
+    public IEnumerable<DT.ResourcePermission> GetResourcePermissions(Guid resourceId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       using (var pm = PersistenceManager)
@@ -682 +690 @@
 
     #region Resource Methods
-    public IEnumerable<Resource> GetChildResources(Guid resourceId) {
+    public IEnumerable<DT.Resource> GetChildResources(Guid resourceId) {
       // unused
       throw new NotImplementedException();
@@ -718 +726 @@
     }
 
-    public Slave GetSlave(Guid slaveId) {
+    public DT.Slave GetSlave(Guid slaveId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator);
       using (var pm = PersistenceManager)
@@ -727 +735 @@
     }
 
-    public SlaveGroup GetSlaveGroup(Guid slaveGroupId) {
+    public DT.SlaveGroup GetSlaveGroup(Guid slaveGroupId) {
       // unused
       throw new NotImplementedException();
     }
 
-    public IEnumerable<Slave> GetSlaves() {
+    public IEnumerable<DT.Slave> GetSlaves() {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       bool isAdministrator = RoleVerifier.IsInRole(HiveRoles.Administrator);
@@ -757 +765 @@
     }
 
-    public IEnumerable<SlaveGroup> GetSlaveGroups() {
+    public IEnumerable<DT.SlaveGroup> GetSlaveGroups() {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       bool isAdministrator = RoleVerifier.IsInRole(HiveRoles.Administrator);
@@ -878 +886 @@
     }
 
-    public IEnumerable<Task> GetTasksByResourceId(Guid resourceId) {
+    public IEnumerable<DT.Task> GetTasksByResourceId(Guid resourceId) {
       // unused
       throw new NotImplementedException();
@@ -967 +975 @@
     }
 
-    public IEnumerable<Downtime> GetDowntimesForResource(Guid resourceId) {
+    public IEnumerable<DT.Downtime> GetDowntimesForResource(Guid resourceId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       using (var pm = PersistenceManager)
@@ -995 +1003 @@
 
     #region UserPriorities Methods
-    public IEnumerable<UserPriority> GetUserPriorities() {
+    public IEnumerable<DT.UserPriority> GetUserPriorities() {
       using (var pm = PersistenceManager)
       using (new PerformanceLogger("GetUserPriorities")) {

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame

@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Services.WebApp")]
-[assembly: AssemblyDescription("HeuristicLab Services Application Container")]
+[assembly: AssemblyTitle("HeuristicLab.Services.WebApp.Statistics")]
+[assembly: AssemblyDescription("HeuristicLab WebApp Statistics plugin")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

@@ -83 +83 @@
                     UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                     CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                    State = clientInfo.SlaveState.ToString(),
+                    State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                     LastUpdate = clientInfo.Time,
                     GroupId = client.ResourceGroupId,
@@ -132 +132 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,
@@ -218 +218 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialog.cshtml

@@ -5 +5 @@
     <h4 class="modal-title">Task #{{taskNo}} - {{task.Id}}</h4>
 </div>
-<div class="modal-body" style="height: 430px">
+<div class="modal-body" style="height: 440px">
     <tabset>
         <tab heading="Details">
-            <div style="height: 330px" class="center-block">
+            <div style="height: 340px" class="center-block">
                 <div class="row" style="padding-top: 30px">
                     <div class="col-md-6">

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml

@@ -3 +3 @@
     <h4 class="modal-title">Task #{{taskNo}} - {{task.Id}}</h4>
 </div>
-<div class="modal-body" style="height: 430px">
+<div class="modal-body" style="height: 440px">
     <tabset>
         <tab heading="Details">
-            <div style="height: 330px" class="center-block">
+            <div style="height: 340px" class="center-block">
                 <div class="row" style="padding-top: 30px">
                     <div class="col-md-12">

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -106 +106 @@
       PluginManager pluginManager = PluginManager.Instance;
       foreach (var plugin in pluginManager.Plugins) {
-        if (File.Exists(string.Format(@"{0}\{1}\{1}.js", PluginManager.PluginsDirectory, plugin.Name))) {
+        var path = Path.Combine(PluginManager.PluginsDirectory, plugin.Name, string.Concat(plugin.Name, ".js"));
+        if (File.Exists(path)) {
           jsFiles.Add(string.Format("WebApp/plugins/{0}/{0}.js", plugin.Name));
         }

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/PluginManager.cs

@@ -43 +43 @@
 
     public static string PluginsDirectory {
-      get { return string.Format(@"{0}WebApp\plugins", HttpRuntime.AppDomainAppPath); }
+      get {
+        return Path.Combine(HttpRuntime.AppDomainAppPath, "WebApp", "plugins");
+      }
     }
 
@@ -94 +96 @@
       Plugin plugin = LookupPlugin(name);
       if (plugin == null) {
-        string directory = string.Format(@"{0}\{1}", PluginsDirectory, name);
+        string directory = Path.Combine(PluginsDirectory, name);
         if (Directory.Exists(directory)) {
           plugin = new Plugin(name, directory, Configuration);