Changeset 5053

Timestamp:

12/07/10 10:46:26 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed solution name
• minor changes to IHiveService

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveExperimentClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveJobClient.cs (modified) (1 diff)
• HeuristicLab.Hive-3.3.dll.config (deleted)
• HeuristicLab.Hive-3.4.dll.config (added)
• HeuristicLab.Hive-3.4.sln (added)
• HeuristicLab.Hive.sln (deleted)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveExperimentClient.cs

@@ -305 +305 @@
       using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
         foreach (HiveJob hj in HiveJob.GetAllHiveJobs()) {
-          service.Obj.AbortJob(hj.Job.Id);
+          service.Obj.StopJob(hj.Job.Id);
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveJobClient.cs

@@ -465 +465 @@
       IEnumerable<IPluginDescription> neededPlugins = ApplicationManager.Manager.Plugins; //HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
       using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
-        IEnumerable<Plugin> availablePlugins = service.Obj.GetAvailablePlugins();
+        IEnumerable<Plugin> availablePlugins = service.Obj.GetPlugins();
         foreach (IPluginDescription neededPlugin in neededPlugins) {
           Plugin found = availablePlugins.Where(availablePlugin => availablePlugin.Name == neededPlugin.Name && availablePlugin.Version.Major == neededPlugin.Version.Major && availablePlugin.Version.Minor == neededPlugin.Version.Minor && availablePlugin.Version.Revision == neededPlugin.Version.Revision && availablePlugin.Version.MinorRevision == neededPlugin.Version.MinorRevision).SingleOrDefault();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

@@ -35 +35 @@
     JobData GetJobData(Guid jobId);
 
-    [OperationContract]
-    Stream GetJobDataStreamed(Guid jobId);
+    //[OperationContract]
+    //Stream GetJobDataStreamed(Guid jobId);
 
     [OperationContract]
     void UpdateJob(Job jobDto, JobData jobDataDto);
         
-    [OperationContract] // formerly StoreFinishedJobResultStreamed
-    void UpdateJobDataStreamed(Stream stream);
+    //[OperationContract] // formerly StoreFinishedJobResultStreamed
+    //void UpdateJobDataStreamed(Stream stream);
 
     [OperationContract]
@@ -72 +72 @@
     #endregion
 
-
     #region Job Control Methods
     [OperationContract]
-    void AbortJob(Guid jobId);
+    void StopJob(Guid jobId);
 
     [OperationContract]
@@ -116 +115 @@
     //[OperationContract]
     //void Logout(Guid clientId);
+
+    [OperationContract]
+    void Hello(Guid slaveId, string name, int cores, int memory);
+
+    [OperationContract]
+    void GoodBye();
     #endregion
 
     #region Heartbeat Methods
     [OperationContract]
-    List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat);
+    List<MessageContainer> Heartbeat(Heartbeat heartbeat);
     #endregion
 
     #region Plugin Methods
     [OperationContract]
+    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
+    [OperationContract]
+    IEnumerable<Plugin> GetPlugins();
+    [OperationContract]
     IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
-    [OperationContract]
-    Stream GetStreamedPluginDatas(List<Guid> pluginIds);
-    [OperationContract]
-    IEnumerable<Plugin> GetAvailablePlugins();
-    [OperationContract]
-    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
     #endregion
 
-    #region Calendar Methods
-    [OperationContract]
-    IEnumerable<Appointment> GetCalendar(Guid slaveId);
-    [OperationContract]
-    void SetCalendarStatus(Guid clientId, CalendarState state);
-    [OperationContract]
-    IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
-    [OperationContract]
-    void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
-    #endregion
+    // slave should be unaware of calendar. only server decides based on calendar if slave gets jobs
+    //#region Calendar Methods
+    //[OperationContract]
+    //IEnumerable<Appointment> GetCalendar(Guid slaveId);
+    //[OperationContract]
+    //void SetCalendarStatus(Guid clientId, CalendarState state);
+    //[OperationContract]
+    //IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid);
+    //[OperationContract]
+    //void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced);
+    //#endregion
 
     #region Slave Methods

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

@@ -113 +113 @@
 
     #region Job Control Methods
-    public void AbortJob(Guid jobId) {
+    public void StopJob(Guid jobId) {
       using (trans.OpenTransaction()) {
         throw new NotImplementedException();
@@ -164 +164 @@
     
     #region Login Methods
-    //public void Login() {
-    //  throw new NotImplementedException();
-    //}
-
-    //public void Login(Slave slave) {
-    //  throw new NotImplementedException();
-    //}
-
-    //public void Logout(Guid clientId) {
-    //  throw new NotImplementedException();
-    //}
+    public void Hello(Guid slaveId, string name, int cores, int memory) {
+      throw new NotImplementedException();
+    }
+
+    public void GoodBye() {
+      throw new NotImplementedException();
+    }
     #endregion
 
     #region Heartbeat Methods
-    public List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat) {
+    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
       using (trans.OpenTransaction()) {
         return hive.ProcessHeartbeat(heartbeat);
@@ -186 +182 @@
 
     #region Plugin Methods
-    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
-      throw new NotImplementedException();
-    }
-    public Stream GetStreamedPluginDatas(List<Guid> pluginIds) {
-      throw new NotImplementedException();
-    }
-    public IEnumerable<Plugin> GetAvailablePlugins() {
-      return dao.GetPlugins(x => true);
-    }
     public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
       using (trans.OpenTransaction()) {
@@ -205 +192 @@
       }
     }
-    #endregion
-
-    #region Calendar Methods
-    public IEnumerable<Appointment> GetCalendar(Guid clientId) {
-      throw new NotImplementedException();
-    }
-
-    public void SetCalendarStatus(Guid clientId, CalendarState state) {
-      using (trans.OpenTransaction()) {
-        throw new NotImplementedException();
-      }
-    }
-
-    public IEnumerable<Appointment> GetUptimeCalendarForResource(Guid guid) {
-      throw new NotImplementedException();
-    }
-
-    public void SetUptimeCalendarForResource(Guid guid, IEnumerable<Appointment> appointments, bool isForced) {
-      throw new NotImplementedException();
-    }
-    #endregion
-
+    public IEnumerable<Plugin> GetPlugins() {
+      return dao.GetPlugins(x => true);
+    }
+    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
+      throw new NotImplementedException();
+    }
+    public Stream GetStreamedPluginDatas(List<Guid> pluginIds) {
+      throw new NotImplementedException();
+    }
+    #endregion
+    
     #region Slave Methods
     public Guid AddSlave(Slave slave) {
@@ -292 +268 @@
 
     #endregion
+
   }
 }