X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/hpcvm.git/blobdiff_plain/3502bc1e43c70f69ae488cb8418a0ef4fd885d19..d83793da6e881ebab006a50a47fbba914e65f9cf:/src/and/hpcvm/Client.java

diff --git a/src/and/hpcvm/Client.java b/src/and/hpcvm/Client.java
index 2f1e01b..793d066 100644
--- a/src/and/hpcvm/Client.java
+++ b/src/and/hpcvm/Client.java
@@ -15,6 +15,7 @@ import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.ArrayList;
+import java.util.concurrent.Semaphore;
 
 
 public class Client extends UnicastRemoteObject implements ServicesClient
@@ -43,6 +44,10 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 	private SaveProcess saveProcess;
 	private int maxRetryVM ;
 	private int timeRetryVM ;
+	private Semaphore sema ;
+	private boolean emergencyStop ;
+	private Process procSave ;
+	private boolean lastSaveOk ;
 	
 		
 	protected Client() throws RemoteException 
@@ -50,12 +55,43 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		super() ;
 	}
 
+	@Override
+	public void emergencyStop()
+	{
+		emergencyStop = true ;
+		
+		// Saving processus stop
+		synchronized( saveProcess ) {
+			saveProcess.setStatus( false ) ;
+			try {
+				saveProcess.notifyAll() ;
+			} catch( Exception e ) {}}
+		
+		try {
+			procSave.destroy() ;
+		} catch( Exception e ) {}
+		
+		stopVM() ;
+	}
 	
 	@Override
 	public int startVM( int _mode ) 
 	{		
 		if( machine != null && ! machine.getStatus().equalsIgnoreCase( "running" ) )
 		{
+			try {
+				sema.acquire() ;
+			} catch( InterruptedException e2 ) {
+				System.err.println( "Problem with semaphore acquiring!" ) ;
+				e2.printStackTrace() ;
+			}
+
+			// Checking first start
+			if( machine.checkVmx() == 1 )
+			{
+				return 1 ;
+			}
+			
 			boolean ret = true ;
 			int retry = 0 ;
 			
@@ -78,39 +114,57 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name(), "nogui"} ;
 			
 			while( ret )
-			try {
-				Process p = Runtime.getRuntime().exec( command ) ;
-				p.waitFor() ;
+			{
 				
-				if( p.exitValue() == 0 )
+				if( emergencyStop )
 				{
-					System.out.println( "Virtual machine successfully started." ) ;
-					ret = false ;
-				} else {
-					System.err.println( "Virtual machine not started!" ) ;
-					ret = printProcessError( p ) ;
-					
-					if( ! ret )
+					return 1 ;
+				}
+		
+				try {
+					Process p = Runtime.getRuntime().exec( command ) ;
+					p.waitFor() ;
+				
+					if( p.exitValue() == 0 )
 					{
-						return 1 ;
+						System.out.println( "Virtual machine successfully started." ) ;
+						ret = false ;
 					} else {
-						retry++ ;
-						if( retry >= maxRetryVM )
+						System.err.println( "Virtual machine not started!" ) ;
+						ret = printProcessError( p ) ;
+					
+						if( ! ret )
 						{
-							System.err.println( "Unable to start VM!" ) ;
+							sema.release() ;
+						
 							return 1 ;
+						} else {
+							retry++ ;
+							if( retry >= maxRetryVM )
+							{
+								System.err.println( "Unable to start VM!" ) ;
+							
+								sema.release() ;
+							
+								return 1 ;
+							}
+							System.out.println( "Retrying (" + retry + ") ... " ) ;
+							Thread.sleep( timeRetryVM ) ;
 						}
-						System.out.println( "Retrying (" + retry + ") ... " ) ;
-						Thread.sleep( timeRetryVM ) ;
 					}
+				} catch( IOException e ) {
+					System.err.println( "Error during execution of start command: " ) ;
+					e.printStackTrace() ;
+				
+					sema.release() ;
+				
+					return 1 ;
+				} catch( InterruptedException e ) {
+					e.printStackTrace() ;
+				
+					sema.release() ;
+					return 1 ;
 				}
-			} catch( IOException e ) {
-				System.err.println( "Error during execution of start command: " ) ;
-				e.printStackTrace() ;
-				return 1 ;
-			} catch( InterruptedException e ) {
-				e.printStackTrace() ;
-				return 1 ;
 			}
 			
 			
@@ -121,6 +175,11 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			
 			while( ! started )
 			{
+				if( emergencyStop )
+				{
+					return 1 ;
+				}
+				
 				/** Waiting for VM being started **/
 				try {
 					Thread.sleep( wait_start ) ;
@@ -141,71 +200,94 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 					fw.close() ;
 				} catch( IOException e1 ) {
 					e1.printStackTrace() ;
+					
+					sema.release() ;
+					return 1 ;
 				}
 				
 				command = new String[]{ ushell, working_directory + "/testStarted.sh"} ;
 
 				while( ret )
-				try {
-					Process p = Runtime.getRuntime().exec( command ) ;
-					p.waitFor() ;
-					
-					if( p.exitValue() == 0 )
+				{
+					if( emergencyStop )
 					{
-						started = true ;
+						return 1 ;
+					}
+				
+					try {
+						Process p = Runtime.getRuntime().exec( command ) ;
+						p.waitFor() ;
+					
+						if( p.exitValue() == 0 )
+						{
+							started = true ;
 //						machine.setStatus( "running" ) ;
 //						if( _mode == 0 )
 //						{
 //							LocalHost.Instance().getServerStub().changeStatus( 
 //								LocalHost.Instance().getIP(), "running" ) ;
 //						} 
-						ret = false ;
-					} else {
-						System.err.println( "Error while checking if the VM is started!" ) ;
+							ret = false ;
+						} else {
+							System.err.println( "Error while checking if the VM is started!" ) ;
 //						printProcessError( p.getErrorStream() ) ;
-						ret = printProcessError( p ) ;
+							ret = printProcessError( p ) ;
 						
-						if( ! ret )
-						{
-							return 1 ;
-						} else {
-							retry++ ;
-							if( retry >= maxRetryVM )
+							if( ! ret )
 							{
-								System.err.println( "Unable to check VM!" ) ;
+								sema.release() ;
+								stopVM() ;
 								return 1 ;
+							} else {
+								retry++ ;
+								if( retry >= maxRetryVM )
+								{
+									System.err.println( "Unable to check VM!" ) ;
+								
+									sema.release() ;
+									stopVM() ;
+									return 1 ;
+								}
+								System.out.println( "Retrying (" + retry + ") ... " ) ;
+								Thread.sleep( timeRetryVM ) ;
 							}
-							System.out.println( "Retrying (" + retry + ") ... " ) ;
-							Thread.sleep( timeRetryVM ) ;
-						}
 //						wait_start = wait_start / 2 ;
-						count++ ;
+							count++ ;
+						}
+					} catch( IOException e ) {
+						e.printStackTrace() ;
+						sema.release() ;
+						stopVM() ;
+						return 1 ;
+					} catch( InterruptedException e ) {
+						e.printStackTrace() ;
+						sema.release() ;
+						stopVM() ;
+						return 1 ;
 					}
-				} catch( IOException e ) {
-					e.printStackTrace() ;
-				} catch( InterruptedException e ) {
-					e.printStackTrace() ;
-				}
 				
-				if( count == max_start_try && ! started )
-				{
-					System.err.println( "Virtual machine not responding!!" ) ;
+					if( count == max_start_try && ! started )
+					{
+						System.err.println( "Virtual machine not responding!!" ) ;
 					
-					try {
-						LocalHost.Instance().getServerStub().changeStatus( 
-								LocalHost.Instance().getIP(), "undefined" ) ;
-					} catch( RemoteException e ) {
-						e.printStackTrace() ;
-					}
-										
-					stopVM() ;
+						try {
+							LocalHost.Instance().getServerStub().changeStatus( 
+									LocalHost.Instance().getIP(), "undefined" ) ;
+						} catch( RemoteException e ) {
+							e.printStackTrace() ;
+						}
+						
+						sema.release() ;
 					
-					return 1 ;
-				} else {
-					try {
-						Thread.sleep( 3000 ) ;
-					} catch( InterruptedException e ) {
-						e.printStackTrace() ;
+						stopVM() ;
+					
+						return 1 ;
+					} else {
+						try {
+							Thread.sleep( 3000 ) ;
+						} catch( InterruptedException e ) {
+							e.printStackTrace() ;
+						}
 					}
 				}
 			}
@@ -228,6 +310,9 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				fw.close() ;
 			} catch( IOException e1 ) {
 				e1.printStackTrace() ;
+				sema.release() ;
+				stopVM() ;
+				return 1 ;
 			}
 			
 			command = new String[]{ ushell, working_directory + "/sendHostIP.sh"} ;
@@ -236,41 +321,57 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			retry = 0 ;
 			
 			while( ret )
-			try {
-				Process p = Runtime.getRuntime().exec( command ) ;
-				p.waitFor() ;
-				
-				if( p.exitValue() == 0 )
+			{
+				if( emergencyStop )
 				{
-					System.out.println( "VM received the host IP." ) ;
-					ret = false ;
-				} else {
-					System.err.println( "VM did not received the host IP!" ) ;
-//					printProcessError( p.getErrorStream() ) ;
-					ret = printProcessError( p ) ;
-					
-					if( ! ret )
+					return 1 ;
+				}
+			
+				try {
+					Process p = Runtime.getRuntime().exec( command ) ;
+					p.waitFor() ;
+				
+					if( p.exitValue() == 0 )
 					{
-						return 1 ;
+						System.out.println( "VM received the host IP." ) ;
+						ret = false ;
 					} else {
-						retry++ ;
-						if( retry >= maxRetryVM )
-						{
-							System.err.println( "Unable to send information to VM!" ) ;
+						System.err.println( "VM did not received the host IP!" ) ;
+//					printProcessError( p.getErrorStream() ) ;
+						ret = printProcessError( p ) ;
 					
+						if( ! ret )
+						{
+							sema.release() ;
 							stopVM() ;
-							
 							return 1 ;
+						} else {
+							retry++ ;
+							if( retry >= maxRetryVM )
+							{
+								System.err.println( "Unable to send information to VM!" ) ;
+					
+								sema.release() ;
+								stopVM() ;
+							
+								return 1 ;
+							}
+							System.out.println( "Retrying (" + retry + ") ... " ) ;
+							Thread.sleep( timeRetryVM ) ;
 						}
-						System.out.println( "Retrying (" + retry + ") ... " ) ;
-						Thread.sleep( timeRetryVM ) ;
 					}
+				} catch( IOException e ) {
+					System.err.println( "Error during execution of runScriptInGuest command: " ) ;
+					e.printStackTrace() ;
+					sema.release() ;
+					stopVM() ;
+					return 1 ;
+				} catch( InterruptedException e) {
+					e.printStackTrace() ;
+					sema.release() ;
+					stopVM() ;
+					return 1 ;
 				}
-			} catch( IOException e ) {
-				System.err.println( "Error during execution of runScriptInGuest command: " ) ;
-				e.printStackTrace() ;
-			} catch( InterruptedException e) {
-				e.printStackTrace() ;
 			}
 					
 			/** Sending the vm ip **/
@@ -291,6 +392,9 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				fw.close() ;
 			} catch( IOException e1 ) {
 				e1.printStackTrace() ;
+				sema.release() ;
+				stopVM() ;
+				return 1 ;
 			}
 			
 			command = new String[]{ ushell, working_directory + "/sendVmIP.sh"} ;
@@ -299,43 +403,59 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			retry = 0 ;
 			
 			while( ret )
-			try {
-				Process p = Runtime.getRuntime().exec( command ) ;
-				p.waitFor() ;
-				
-				if( p.exitValue() == 0 )
+			{
+				if( emergencyStop )
 				{
-					System.out.println( "VM received its assigned IP." ) ;
+					return 1 ;
+				}
+			
+				try {
+					Process p = Runtime.getRuntime().exec( command ) ;
+					p.waitFor() ;
+				
+					if( p.exitValue() == 0 )
+					{
+						System.out.println( "VM received its assigned IP." ) ;
 //					return 0 ;
-					ret = false ;
-					machine.setStatus( "running" ) ;
-				} else {
-					System.err.println( "VM did not received its assigned IP!" ) ;
+						ret = false ;
+						machine.setStatus( "running" ) ;
+					} else {
+						System.err.println( "VM did not received its assigned IP!" ) ;
 //					printProcessError( p.getErrorStream() ) ;
-					ret = printProcessError( p ) ;
+						ret = printProcessError( p ) ;
 					
-					if( ! ret )
-					{
-						return 1 ;
-					} else {
-						retry++ ;
-						if( retry >= maxRetryVM )
+						if( ! ret )
 						{
-							System.err.println( "Unable to send information to VM!" ) ;
-							
+							sema.release() ;
 							stopVM() ;
-							
 							return 1 ;
+						} else {
+							retry++ ;
+							if( retry >= maxRetryVM )
+							{
+								System.err.println( "Unable to send information to VM!" ) ;
+							
+								sema.release() ;
+								stopVM() ;
+							
+								return 1 ;
+							}
+							System.out.println( "Retrying (" + retry + ") ... " ) ;
+							Thread.sleep( timeRetryVM ) ;
 						}
-						System.out.println( "Retrying (" + retry + ") ... " ) ;
-						Thread.sleep( timeRetryVM ) ;
 					}
+				} catch( IOException e ) {
+					System.err.println( "Error during execution of runScriptInGuest command: " ) ;
+					e.printStackTrace() ;
+					sema.release() ; 
+					stopVM() ;
+					return 1 ;
+				} catch( InterruptedException e ) {
+					e.printStackTrace() ;
+					sema.release() ;
+					stopVM() ;
+					return 1 ;
 				}
-			} catch( IOException e ) {
-				System.err.println( "Error during execution of runScriptInGuest command: " ) ;
-				e.printStackTrace() ;
-			} catch( InterruptedException e ) {
-				e.printStackTrace() ;
 			}
 			
 			if( _mode == 0 )
@@ -349,9 +469,13 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				}
 			}
 			
+			sema.release() ;
+			
 			return 0 ;
 		}
 		
+		sema.release() ;
+		
 		return 1 ;
 	}
 
@@ -360,11 +484,19 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 	{		
 		if( machine != null && machine.getStatus().equalsIgnoreCase( "stopped" ) )
 		{
+			emergencyStop = false ;
 			return 0 ;
 		}
 		
 		if( machine != null && ! machine.getStatus().equalsIgnoreCase( "stopped" ) )
 		{
+			try {
+				sema.acquire() ;
+			} catch( InterruptedException e2 ) {
+				System.err.println( "Problem with semaphore acquiring!" ) ;
+				e2.printStackTrace() ;
+			}
+			
 			System.out.print( "Stopping VM ... " ) ;
 			
 			boolean ret = true ;
@@ -399,12 +531,14 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 					
 					if( ! ret )
 					{
+						sema.release() ;
 						return 1 ;
 					} else {
 						retry++ ;
 						if( retry >= maxRetryVM )
 						{
 							System.err.println( "Unable to stop VM!" ) ;
+							sema.release() ;
 							return 1 ;
 						}
 						System.out.println( "Retrying (" + retry + ") ... " ) ;
@@ -416,8 +550,12 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			} catch( IOException e ) {
 				System.err.println( "Error during execution of stop command: " ) ;
 				e.printStackTrace() ;
+				sema.release() ;
+				return 1 ;
 			} catch( InterruptedException e ) {
 				e.printStackTrace() ;
+				sema.release() ;
+				return 1 ;
 			}
 			
 			machine.setStatus( "stopped" ) ;
@@ -429,39 +567,51 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				e1.printStackTrace() ;
 			}
 			
-			if( ! isRestartedSave )
+//			if( ! isRestartedSave )
+//			{
+//				/** Restoring the original vmx file (necessary after a crash) **/
+//				command = new String[]{ "/bin/cp", 
+//						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name_normal(),
+//						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name() } ;
+//				
+//					try {
+//						Process p = Runtime.getRuntime().exec( command ) ;
+//						p.waitFor() ;
+//			
+//						if( p.exitValue() == 0 )
+//						{
+//							System.out.println( "Successfully replaced the VMX file." ) ;
+//							sema.release() ;
+//							emergencyStop = false ;
+//							return 0 ;
+//						} else {
+//							System.err.println( "Unsuccessful replacement of the VMX file!" ) ;
+////							printProcessError( p.getErrorStream() ) ;
+//							printProcessError( p ) ;
+//							sema.release() ;
+//							return 1 ;
+//						}
+//					} catch( IOException e ) {
+//						System.err.println( "Error during VMX file replacement: " ) ;
+//						e.printStackTrace() ;
+//						sema.release() ;
+//						return 1 ;
+//					} catch( InterruptedException e ) {
+//						e.printStackTrace() ;
+//						sema.release() ;
+//						return 1 ;
+//					}
+//			} else {
+			if(	machine.checkVmx() == 0 )
 			{
-				/** Restoring the original vmx file (necessary after a crash) **/
-				command = new String[]{ "/bin/cp", 
-						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name_normal(),
-						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name() } ;
-				
-					try {
-						Process p = Runtime.getRuntime().exec( command ) ;
-						p.waitFor() ;
-			
-						if( p.exitValue() == 0 )
-						{
-							System.out.println( "Successfully replaced the VMX file." ) ;
-							return 0 ;
-						} else {
-							System.err.println( "Unsuccessful replacement of the VMX file!" ) ;
-//							printProcessError( p.getErrorStream() ) ;
-							printProcessError( p ) ;
-						
-							return 1 ;
-						}
-					} catch( IOException e ) {
-						System.err.println( "Error during VMX file replacement: " ) ;
-						e.printStackTrace() ;
-					} catch( InterruptedException e ) {
-						e.printStackTrace() ;
-					}
-			} else {
+				sema.release() ;
+				emergencyStop = false ;
 				return 0 ;
 			}
 		}
 		
+		sema.release() ;
+		
 		return 1 ;
 	}
 
@@ -475,6 +625,13 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		
 		if( machine != null && ! machine.getStatus().equalsIgnoreCase( "suspended" ) )
 		{
+			try {
+				sema.acquire() ;
+			} catch( InterruptedException e2 ) {
+				System.err.println( "Problem with semaphore acquiring!" ) ;
+				e2.printStackTrace() ;
+			}
+			
 			System.out.print( "Suspending VM ... " ) ;
 			
 			boolean ret = true ;
@@ -511,12 +668,17 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 					
 					if( ! ret )
 					{
+						sema.release() ;
+						
 						return 1 ;
 					} else {
 						retry++ ;
 						if( retry >= maxRetryVM )
 						{
 							System.err.println( "Unable to suspend VM!" ) ;
+							
+							sema.release() ;
+							
 							return 1 ;
 						}
 						System.out.println( "Retrying (" + retry + ") ... " ) ;
@@ -544,9 +706,13 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				}
 			}
 			
+			sema.release() ;
+			
 			return 0 ;
 		}
-
+		
+		sema.release() ;
+		
 		return 1 ;
 	}
 
@@ -635,62 +801,53 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			if( machine.deployLastSave() == 0 )
 			{
 				if( isRestartedSave )
-				{
-					// Using the specific vmx file
-					System.out.print( "Changing VMX file after crash ... " ) ;
-				
-					String[] command = new String[]{ "/bin/cp", 
-						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name_crash(),
-						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name() } ;
-					
-					try {
-						Process p = Runtime.getRuntime().exec( command ) ;
-						p.waitFor() ;
-				
-						if( p.exitValue() == 0 )
-						{
-							System.out.println( "Successfully replaced the VMX file." ) ;
-						} else {
-							System.err.println( "Unsuccessful replacement of the VMX file!" ) ;
-//							printProcessError( p.getErrorStream() ) ;
-							printProcessError( p ) ;
-							
-							return 1 ;
-						}
-					} catch( IOException e ) {
-						System.err.println( "Error during VMX file replacement: " ) ;
-						e.printStackTrace() ;
-					} catch( InterruptedException e ) {
-						e.printStackTrace() ;
-					}
-					
-					// Removing lock files
-					System.out.print( "Removing lock files ... " ) ;
-				
-					command = new String[]{ "/bin/rm", "-rf", 
-						working_directory + "/" + machine.getDirectory() 
-						+ "/" + machine.getVmx_name() + ".lck" } ;
-					
-					try {
-						Process p = Runtime.getRuntime().exec( command ) ;
-						p.waitFor() ;
-				
-						if( p.exitValue() == 0 )
-						{
-							System.out.println( "Successfully deleted lock files." ) ;
-						} else {
-							System.err.println( "Unsuccessful deletion of lock files!" ) ;
-//							printProcessError( p.getErrorStream() ) ;
-							printProcessError( p ) ;
-							
-							return 1 ;
-						}
-					} catch( IOException e ) {
-						System.err.println( "Error during lock files deletion: " ) ;
-						e.printStackTrace() ;
-					} catch( InterruptedException e ) {
-						e.printStackTrace() ;
+				{
+					// Using the specific vmx file
+					machine.setDeployFault( true ) ;
+					
+					// Writing the restarted save mark
+					try {
+						FileWriter fw = new FileWriter( new File( working_directory + "/" + machine.getDirectory() + "/fault.hpcvm" ) ) ;
+						fw.write( "fault!" ) ;
+						fw.flush() ;
+						fw.close() ;
+						fw = null ;
+					} catch( IOException e1 ) {
+						e1.printStackTrace() ;
+						System.err.println( "Unable to mark the fault!" ) ;
+					}	
+					
+					if( machine.checkVmx() == 1 )
+					{
+						return 1 ;
 					}
+					
+//					System.out.print( "Changing VMX file after crash ... " ) ;
+//				
+//					String[] command = new String[]{ "/bin/cp", 
+//						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name_crash(),
+//						working_directory + "/" + machine.getDirectory() + "/" + machine.getVmx_name() } ;
+//					
+//					try {
+//						Process p = Runtime.getRuntime().exec( command ) ;
+//						p.waitFor() ;
+//				
+//						if( p.exitValue() == 0 )
+//						{
+//							System.out.println( "Successfully replaced the VMX file." ) ;
+//						} else {
+//							System.err.println( "Unsuccessful replacement of the VMX file!" ) ;
+////							printProcessError( p.getErrorStream() ) ;
+//							printProcessError( p ) ;
+//							
+//							return 1 ;
+//						}
+//					} catch( IOException e ) {
+//						System.err.println( "Error during VMX file replacement: " ) ;
+//						e.printStackTrace() ;
+//					} catch( InterruptedException e ) {
+//						e.printStackTrace() ;
+//					}
 				
 					/** Retrieving VM assigned IP **/
 					String vmIP = null ;
@@ -713,6 +870,8 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 				{
 					if( sendSaveOkVM() == 0 )
 					{
+						date_last_save = System.currentTimeMillis() ;
+						
 						return 0 ;
 					}
 				} else {
@@ -825,25 +984,69 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		
 		if( suspendVM( 1 ) == 1 ) { error = true ; errorVM = true ; }
 		
+		if( ! lastSaveOk )
+		{
+			System.out.println( "Deletion of last nok archive ... " ) ;
+			
+			command = new String[]{ "/bin/rm", "-rf", 
+					working_directory + "/" + machine.getName() + "_new_" + machine.getComputationId() + ".tar",
+					working_directory + "/" + machine.getName() + "_new_" + machine.getComputationId() + ".tar.gz", } ;
+							
+			try {
+				procSave = Runtime.getRuntime().exec( command ) ;
+				procSave.waitFor() ;
+				
+				if( procSave.exitValue() == 0 )
+				{
+					System.out.println( "Last nok archive successfully deleted." ) ;
+				} else {
+					System.err.println( "Last nok archive not deleted!" ) ;
+//					printProcessError( p.getErrorStream() ) ;
+					printProcessError( procSave ) ;
+					
+					error = true ;
+				}
+			} catch( IOException e ) {
+				System.err.println( "Error during nok archive deletion command: " ) ;
+				error = true ;
+				e.printStackTrace() ;
+			} catch( InterruptedException e ) {
+				e.printStackTrace() ;
+				error = true ;
+			}
+		}
+		
 		if( ! error )
 		{
 			System.out.print( "Creation of the archive ... " ) ;
 			/** Archive creation **/
-			command = new String[]{ "/bin/tar", "-cvf", 
-				working_directory + "/" + machine.getName() + "_new_" + machine.getComputationId() + ".tar",
-				working_directory + "/" + machine.getDirectory() } ;
-					
+//			command = new String[]{ "/bin/tar", "-cf", 
+//				working_directory + "/" + machine.getName() + "_new_" + machine.getComputationId() + ".tar",
+//				working_directory + "/" + machine.getDirectory() } ;
+//			
+			command = new String[]{ "/bin/tar", "-cf", 
+					machine.getName() + "_new_" + machine.getComputationId() + ".tar",
+					machine.getDirectory(), "-C", working_directory } ;
+				
+			if( emergencyStop )
+			{
+				return 1 ;
+			}
+			
 			try {
-				Process p = Runtime.getRuntime().exec( command ) ;
-				p.waitFor() ;
+				procSave = Runtime.getRuntime().exec( command ) ;
+				procSave.waitFor() ;
 				
-				if( p.exitValue() == 0 )
+				if( procSave.exitValue() == 0 )
 				{
 					System.out.println( "Archive successfully created." ) ;
+					
+					lastSaveOk = false ;
+					
 				} else {
 					System.err.println( "Archive not created!" ) ;
 //					printProcessError( p.getErrorStream() ) ;
-					printProcessError( p ) ;
+					printProcessError( procSave ) ;
 					
 					error = true ;
 				}
@@ -864,17 +1067,22 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 						working_directory + "/" + machine.getName() 
 						+ "_new_" + machine.getComputationId() + ".tar" } ;
 				
+				if( emergencyStop )
+				{
+					return 1 ;
+				}
+				
 				try {
-					Process p = Runtime.getRuntime().exec( command ) ;
-					p.waitFor() ;
+					procSave = Runtime.getRuntime().exec( command ) ;
+					procSave.waitFor() ;
 			
-					if( p.exitValue() == 0 )
+					if( procSave.exitValue() == 0 )
 					{
 						System.out.println( "Archive successfully compressed." ) ;
 					} else {
 						System.err.println( "Archive not compressed!" ) ;
 //						printProcessError( p.getErrorStream() ) ;
-						printProcessError( p ) ;
+						printProcessError( procSave ) ;
 						
 						error = true ;
 					}
@@ -894,10 +1102,12 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			
 			
 			/** Sending ok save signal **/
-			if( ! error )
-			{
+//			if( ! error )
+//			{
 				if( sendSaveOkVM() == 1 ) { error = true ; }
-			}		
+				
+				
+//			}		
 			
 //			/** Deletion of the tar archive **/
 //			if( ! error )
@@ -929,32 +1139,50 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 //				}
 //			}	
 		
-			saveName = working_directory + "/" + machine.getName() + "_new_" 
-						  + machine.getComputationId() + ".tar.gz" ;	
+			saveName = machine.getName() + "_new_" + machine.getComputationId() + ".tar.gz" ;	
 		
 			/** Sending save to neighbor **/
 			if( ! error )
 			{
-				ArrayList<String> sn = machine.getSaveNeighbors() ;
+				if( emergencyStop )
+				{
+					return 1 ;
+				}
+				
+				ArrayList<ServicesClient> sn = machine.getSaveNeighbors() ;
 				
 				for( int i = 0 ; i < sn.size() ; i++ )
 				{
-					System.out.print( "Sending save to " + sn.get( i ) + " ... " ) ;
-					command = new String[]{ "/usr/bin/scp", saveName,
-							sn.get( i ) + ":" 
-							+ working_directory } ;
+					String name ;
+					String wd ;
+					String snIP ;
+					
+					try {
+						name = sn.get( i ).getName() ;
+						wd = sn.get( i ).getWorkingDirectory() ;
+						snIP = sn.get( i ).getIPHost() ;
+					} catch (RemoteException e2) {
+						System.err.println( "Unable to retrieve information on one save neighbor!" ) ;
+						e2.printStackTrace() ;
+						continue ; 
+					}
+					
+					System.out.print( "Sending save to " + name + " ... " ) ;
+					
+					command = new String[]{ "/usr/bin/scp", working_directory + "/" + saveName,
+								snIP + ":" + wd } ;
 				
 					try {
-						Process p = Runtime.getRuntime().exec( command ) ;
-						p.waitFor() ;
+						procSave = Runtime.getRuntime().exec( command ) ;
+						procSave.waitFor() ;
 			
-						if( p.exitValue() == 0 )
+						if( procSave.exitValue() == 0 )
 						{
 							System.out.println( "Archive successfully sent." ) ;
 						} else {
 							System.err.println( "Archive not sent!" ) ;
 //							printProcessError( p.getErrorStream() ) ;
-							printProcessError( p ) ;
+							printProcessError( procSave ) ;
 						
 							error = true ;
 						}
@@ -1034,6 +1262,9 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		wait_start = 15000 ;
 		max_start_try = 10 ;
 		
+		sema = new Semaphore( 1 ) ;
+		emergencyStop = false ;
+		
 		maxRetryVM = 10 ;
 		timeRetryVM = 10000 ;
 		
@@ -1041,6 +1272,7 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		date_last_save = 0 ;
 		
 		isRestartedSave = false ;
+		lastSaveOk = true ;
 		
 		/** Connection to server **/
 		try {
@@ -1383,6 +1615,8 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 						
 							/* Starting the VM save */
 							saveVM() ;
+							
+							date_last_save = System.currentTimeMillis() ; 
 						} else {
 							sendSaveOkVM() ;
 						}
@@ -1444,14 +1678,15 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 	@Override
 	public void saveOk() 
 	{
-		String save_name = "VmTest_" + machine.getComputationId() +
-			"_last.tar.gz" ;
+		String save_name = machine.getName() + "_last_" + machine.getComputationId() +
+			".tar.gz" ;
 		
-		String save_new = working_directory + "/" + machine.getName() + "_new_" 
+		String save_new = machine.getName() + "_new_" 
 		  + machine.getComputationId() + ".tar.gz" ;
 		
 		String[] command = new String[]{ "/bin/mv", 
-				save_new, save_name } ;
+				working_directory + "/" + save_new, 
+				working_directory + "/" + save_name } ;
 		
 		try {
 			Process p = Runtime.getRuntime().exec( command ) ;
@@ -1459,8 +1694,8 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		
 			if( p.exitValue() == 0 )
 			{
-				System.out.println( "Last save OK" ) ;
 				machine.setSave_last( save_name ) ;
+				System.out.println( "Last save OK" ) ;
 			} else {
 				System.err.println( "Last save NOK!" ) ;
 				System.err.println( "Error: " ) ;
@@ -1473,24 +1708,203 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 		} catch( InterruptedException e ) {
 			e.printStackTrace() ;
 		}
+		
+		// Changing on save neighbors
+		for( int i = 0 ; i < machine.getSaveNeighbors().size() ; i++ )
+		{
+			try {
+				machine.getSaveNeighbors().get( i ).changeSaveName( save_new, save_name, machine.getComputationId() ) ;
+			} catch( RemoteException e ) {
+				try {
+					System.err.println( "Unable to change save name on " + machine.getSaveNeighbors().get( i ).getName() + "!" ) ;
+				} catch( RemoteException e1 ) {
+					System.err.println( "Unable to change save name on an unamed save neighbor!" ) ;
+					e1.printStackTrace() ;
+				}
+				e.printStackTrace() ;
+			}
+		}
+		
+		// Informing the server
+		int ret = 1 ;
+		try {
+			ret = LocalHost.Instance().getServerStub().changeSaveName( LocalHost.Instance().getIP(), save_name ) ;
+		} catch( RemoteException e ) {
+			System.err.println( "Unable to inform the server about the new save name!" ) ;
+			e.printStackTrace() ;
+		}
+		
+		if( ret == 0 )
+		{
+			System.out.println( "Successfully informing the server about the new save name." ) ;
+		} else {
+			System.err.println( "Problem on the server while informing it about the new save name!" ) ;
+		}
+		
+		// Ok here
+		lastSaveOk = true ;
+	}
+	
+	
+	public void changeSaveName( String _n1, String _n2, int _id )
+	{
+		if( _n1 != null && _n1.length() > 0 )
+		{
+			System.out.println( "Changing save name for processus " + _id + " ... " ) ;
+			
+			String[] command = new String[]{ "/bin/mv", 
+					working_directory + "/" + _n1, 
+					working_directory + "/" + _n2 } ;
+			
+			try {
+				Process p = Runtime.getRuntime().exec( command ) ;
+				p.waitFor() ;
+			
+				if( p.exitValue() == 0 )
+				{
+					System.out.println( "Change save name OK" ) ;
+				} else {
+					System.err.println( "Change save name NOK!" ) ;
+					System.err.println( "Error: " ) ;
+//					printProcessError( p.getErrorStream() ) ;
+					printProcessError( p ) ;
+				}
+			} catch( IOException e ) {
+				System.err.println( "Error during save renaming:" ) ;
+				e.printStackTrace() ;
+			} catch( InterruptedException e ) {
+				e.printStackTrace() ;
+			}
+		}
 	}
 
+	
 	@Override
-	public void setSavingNeighbor( String _sn ) throws RemoteException 
+	public void setSavingNeighbor( ServicesClient _sn )
 	{
-		if( _sn != null && _sn.length() > 0 )
+		if( _sn != null )
 		{
-			ArrayList<String> as = new ArrayList<String>() ;
+			ArrayList<ServicesClient> as = new ArrayList<ServicesClient>() ;
 			as.add( _sn ) ;
 			
-			System.out.println( "Save neighbor: " + _sn ) ;
+			try {
+				System.out.println( "Save neighbor: " + _sn.getName() ) ;
+			} catch( RemoteException e ) {
+				System.err.println( "Unable to retrieve the name of the save neighbor!" ) ;
+				e.printStackTrace() ;
+			}
 			
 			machine.setSaveNeighbors( as ) ;
 		}
 	}
+	
+	
+	@Override
+	public void setSavingNeighbors( ArrayList<ServicesClient> _sn )
+	{
+		if( _sn != null && _sn.size() > 0 )
+		{
+			System.out.print( "Save neighbors: " ) ;
+			for( int i = 0 ; i < _sn.size() ; i++ )
+			{
+				try {
+					System.out.print( _sn.get( i ).getName() ) ;
+				} catch( RemoteException e ) {
+					System.err.println( "Unable to retrieve the name of a save neighbor!" ) ;
+					e.printStackTrace() ;
+				}
+				
+				if( i != _sn.size() - 1 )
+				{
+					System.out.print( ", " ) ;
+				} else {
+					System.out.println( "." ) ;
+				}
+			}
+			
+			machine.setSaveNeighbors( _sn ) ;
+		}
+	}
 
+	
+	@Override
+	public void addSavingNeighbor( ServicesClient _sn )
+	{
+		if( _sn != null )
+		{
+			try {
+				System.out.println( "Adding save neighbor: " + _sn.getName() ) ;
+			} catch( RemoteException e ) {
+				System.err.println( "Unable to retrieve the name of a save neighbor!" ) ;
+				e.printStackTrace() ;
+			}
+			
+			machine.getSaveNeighbors().add( _sn ) ;
+		}
+	}
+	
+	
+	@Override
+	public void addSavingNeighbors( ArrayList<ServicesClient> _sn )
+	{
+		if( _sn != null && _sn.size() > 0 )
+		{
+			System.out.print( "Adding save neighbors: " ) ;
+			for( int i = 0 ; i < _sn.size() ; i++ )
+			{
+				try {
+					System.out.print( _sn.get( i ).getName() ) ;
+				} catch( RemoteException e ) {
+					System.err.println( "Unable to retrieve the name of a save neighbor!" ) ;
+					e.printStackTrace() ;
+				}
+				
+				if( i != _sn.size() - 1 )
+				{
+					System.out.print( ", " ) ;
+				} else {
+					System.out.println( "." ) ;
+				}
+				
+				machine.getSaveNeighbors().add( _sn.get( i ) ) ;
+			}
+		}
+	}
+	
+	
+	@Override
+	public void replaceSavingNeighbor( String _old, ServicesClient _new )
+	{
+		System.out.print( "Replacing a save neihgbor ... " ) ;
+		if( _old != null && _new != null )
+		{
+			int i = 0 ;
+			
+			for( i = 0 ; i < machine.getSaveNeighbors().size() ; i++ )
+			{
+				try {
+					if( machine.getSaveNeighbors().get( i ).getIPHost().equalsIgnoreCase( _old ) )
+					{
+						machine.getSaveNeighbors().set( i, _new ) ;
+						System.out.println( "Save neighbor successfully changed." ) ;
+						break ;
+					}
+				} catch( RemoteException e ) {
+					System.err.println( "Unable to retrieve the IP address of a save neighbor!" ) ;
+					e.printStackTrace() ;
+				}
+			}
+			
+			if( i == machine.getSaveNeighbors().size() )
+			{
+				System.out.println( "I am not concerned by the modification." ) ;
+			}
+		}
+	}
+	
+	
 	@Override
-	public int retrieveSave( String _saveName ) throws RemoteException 
+	public int retrieveSave( String _saveName )
 	{		
 		if( _saveName != null )
 		{
@@ -1498,41 +1912,74 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 			{
 				machine.setSave_last( _saveName ) ;
 			} else {
-				System.err.println( "I have no saving neighbor to contact!!" ) ;
+				System.err.println( "I have no save to retrieve!!" ) ;
 				return 1 ;
 			}
 			
 			// TODO NEIGHBORS !!!!
 			//System.out.println( "!!!! NEIGHBORS !!!!!" ) ;
-			System.out.print( "Retrieving a save on " + machine.getSaveNeighbors().get( 0 ) + " ..." ) ;
-			String[] command = new String[]{ "/usr/bin/scp", 
-					machine.getSaveNeighbors().get( 0 ) + ":"
-					+ working_directory + "/" + machine.getSave_last(),
-					working_directory } ;
-				
-			try {
-				Process p = Runtime.getRuntime().exec( command ) ;
-				p.waitFor() ;
+			boolean ok = false ;
+			boolean go = true ;
+			int i = 0 ;
 			
-				if( p.exitValue() == 0 )
+			while( ! ok && i < machine.getSaveNeighbors().size() )
+			{
+				try {
+					System.out.print( "Retrieving a save on " + machine.getSaveNeighbors().get( 0 ).getName() + " ... " ) ;
+				} catch( RemoteException e1 ) {
+					System.err.println( "Unable to retrieve the name of a save neighbor!" ) ;
+					e1.printStackTrace() ;
+				}
+				
+				String command[] = {} ;
+				
+				try
 				{
-					System.out.println( "Archive successfully retrieved." ) ;
-					isRestartedSave = true ;
-					return 0 ;
-				} else {
-					System.err.println( "Archive not retrieved!" ) ;
-					System.err.println( "Error: " ) ; 
-//					printProcessError( p.getErrorStream() ) ;
-					printProcessError( p ) ;
+					command = new String[]{ "/usr/bin/scp", 
+							machine.getSaveNeighbors().get( i ).getIPHost() + ":" +
+							machine.getSaveNeighbors().get( i ).getWorkingDirectory() + "/" +
+							machine.getSave_last(),
+							working_directory } ;
+				} catch( RemoteException e1 ) {
+					System.err.println( "Unable to retrieve the name of a save neighbor!" ) ;
+					e1.printStackTrace() ;
+					go = false ;
+				}	
+				
+				if( go )
+				try {
+					Process p = Runtime.getRuntime().exec( command ) ;
+					p.waitFor() ;
+			
+					if( p.exitValue() == 0 )
+					{
+						System.out.println( "Archive successfully retrieved." ) ;
+						isRestartedSave = true ;
+						ok = true ;
+					} else {
+						System.err.println( "Archive not retrieved!" ) ;
+						System.err.println( "Error: " ) ; 
+//						printProcessError( p.getErrorStream() ) ;
+						printProcessError( p ) ;
+//						error = true ;
+					}
+				} catch( IOException e ) {
+					System.err.println( "Error during archive retrieve command: " ) ;
+					e.printStackTrace() ;
+//					error = true ;
+				} catch( InterruptedException e ) {
+					e.printStackTrace() ;
 //					error = true ;
 				}
-			} catch( IOException e ) {
-				System.err.println( "Error during archive retrieve command: " ) ;
-				e.printStackTrace() ;
-//				error = true ;
-			} catch( InterruptedException e ) {
-				e.printStackTrace() ;
-//				error = true ;
+				
+				i++ ;
+			}
+			
+			if( ok )
+			{
+				return 0 ;
+			} else {
+				System.err.println( "Unable to retrieve a save archive from any neighbor!" ) ;
 			}
 		}
 		
@@ -1563,6 +2010,46 @@ public class Client extends UnicastRemoteObject implements ServicesClient
 	}
 	
 	
+	public String getWorkingDirectory()
+	{
+		return working_directory ;
+	}
+	
+	
+	public Integer deployVM( String _name, String _archive, String _directory )
+	{
+		if( _name != null && _name.length() > 0 && _archive != null && _name.length() > 0 )
+		{
+			File file = new File( working_directory + "/" + _archive ) ;
+			if( ! file.exists() )
+			{
+				System.err.println( "There is no archive named " + _archive + " in my working directory!" ) ;
+				file = null ;
+				return 2 ;
+			} else if( file.isDirectory() ) {
+				System.err.println( _archive + " is a directory!" ) ;
+				file = null ;
+				return 1 ;
+			}
+			
+			file = null ;
+			
+			machine.setName( _name ) ;
+			machine.setInitial_archive_name( _archive ) ;
+			machine.setDirectory( _directory ) ;
+			
+			if( machine.deployInitialVM() == 1 ) 
+			{
+				System.err.println( "Unable to deploy the initial VM archive!" ) ;
+			} else {				
+				return 0 ;
+			}
+		}
+		
+		return 1 ;
+	}
+	
+	
 	private class SaveProcess
 	{
 		boolean status ;