Changeset 1096 for trunk

Timestamp:

01/08/09 16:22:59 (16 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/HiveServerMessages.resx (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/ClientAdapter.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/JobAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/ApplicationConstants.cs

@@ -47 +47 @@
     public static string RESPONSE_COMMUNICATOR_NO_JO_WITH_THIS_ID = "Communicator.NoJobWithThisId";
     public static string RESPONSE_COMMUNICATOR_WRONG_JOB_STATE = "Communicator.WrongJobState";
+    public static string RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN = "Communicator.UserNotLoggedIn";
 
     public static string RESPONSE_JOB_ALL_JOBS = "Job.AllJobs";

trunk/sources/HeuristicLab.Hive.Contracts/HiveServerMessages.resx

@@ -226 +226 @@
     <value>The state of the job must be offline</value>
   </data>
+  <data name="Communicator.UserNotLoggedIn" xml:space="preserve">
+    <value>User is not logged in, you must login before sending Heartbeats</value>
+  </data>
 </root>

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/CachedDataAdapter.cs

@@ -42 +42 @@
       new List<ICachedDataAdapter>();
 
+    private DataTable temp = new DataTable();
+
     protected CachedDataAdapter() {
       FillCache();
@@ -127 +129 @@
     [MethodImpl(MethodImplOptions.Synchronized)]
     protected abstract RowT FindCachedById(long id);
-
-    protected abstract DataTable GetDataTable();
 
     [MethodImpl(MethodImplOptions.Synchronized)]
@@ -191 +191 @@
             !PutInCache(obj)) {
           //remove from cache
-          GetDataTable().ImportRow(row);
+          temp.ImportRow(row);
 
           UpdateRow(row);

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ClientAdapter.cs

@@ -202 +202 @@
     }
 
-    protected override System.Data.DataTable GetDataTable() {
-      return data;
-    }
     #endregion
 
@@ -214 +211 @@
           ClientInfo found = GetById(client.ClientId);
           if (found != null)
-            client = found;
+            client.Id = found.Id;
         }
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/JobAdapter.cs

@@ -188 +188 @@
         new Selector(adapter.GetData),
         new Selector(cache.AsEnumerable<dsHiveServer.JobRow>));
-    }
-
-    protected override System.Data.DataTable GetDataTable() {
-      return data;
     }
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs

@@ -127 +127 @@
     }
 
-    protected override System.Data.DataTable GetDataTable() {
-      return data;
-    }
     #endregion
 

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -11 +11 @@
 using System.Reflection;
 using HeuristicLab.Hive.JobBase;
+using System.Runtime.CompilerServices;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -44 +45 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     void lifecycleManager_OnServerHeartbeat(object sender, EventArgs e) {
       List<ClientInfo> allClients = new List<ClientInfo>(clientAdapter.GetAll());
+      List<Job> allJobs = new List<Job>(jobAdapter.GetAll());
 
       foreach (ClientInfo client in allClients) {
-        
+        if (client.State != State.offline && client.State != State.nullState) {
+          if (!lastHeartbeats.ContainsKey(client.ClientId)) {
+            client.State = State.offline;
+            clientAdapter.Update(client);
+          } else {
+            DateTime lastHbOfClient = lastHeartbeats[client.ClientId];
+            int diff = lastHbOfClient.CompareTo(DateTime.Now);
+            Console.WriteLine(diff);
+          }
+        } else {
+          if (lastHeartbeats.ContainsKey(client.ClientId))
+            lastHeartbeats.Remove(client.ClientId);
+        }
       }
     }
@@ -54 +69 @@
     #region IClientCommunicator Members
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     public Response Login(ClientInfo clientInfo) {
       Response response = new Response();
 
+      if (lastHeartbeats.ContainsKey(clientInfo.ClientId)) {
+        lastHeartbeats[clientInfo.ClientId] = DateTime.Now;
+      } else {
+        lastHeartbeats.Add(clientInfo.ClientId, DateTime.Now);
+      }
+
       ICollection<ClientInfo> allClients = clientAdapter.GetAll();
       ClientInfo client = clientAdapter.GetById(clientInfo.ClientId);
-      if (client != null && client.State != State.offline) {
+      if (client != null && client.State != State.offline && client.State != State.nullState) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_USER_ALLREADY_ONLINE;
         return response;
       }
+      clientInfo.State = State.idle;
       clientAdapter.Update(clientInfo);
       response.Success = true;
@@ -71 +94 @@
     }
 
+    [MethodImpl(MethodImplOptions.Synchronized)]
     public ResponseHB SendHeartBeat(HeartBeatData hbData) {
       ResponseHB response = new ResponseHB();
+
+      response.ActionRequest = new List<MessageContainer>();
+      if (clientAdapter.GetById(hbData.ClientId).State == State.offline ||
+          clientAdapter.GetById(hbData.ClientId).State == State.nullState) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
+        response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
+        return response;
+      }
 
       if (lastHeartbeats.ContainsKey(hbData.ClientId)) {
@@ -82 +115 @@
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HARDBEAT_RECEIVED;
-      response.ActionRequest = new List<MessageContainer>();
       List<Job> allOfflineJobs = new List<Job>(jobAdapter.GetJobsByState(State.offline));
       if (allOfflineJobs.Count > 0 && hbData.freeCores > 0) 
@@ -146 +178 @@
       return response;
     }
-                           
+
+    [MethodImpl(MethodImplOptions.Synchronized)]                       
     public Response Logout(Guid clientId) {
       Response response = new Response();
-      
+
+      if (lastHeartbeats.ContainsKey(clientId))
+        lastHeartbeats.Remove(clientId);
+
       ClientInfo client = clientAdapter.GetById(clientId);
       if (client == null) {