From 007783f6cf20ce80420724e681ff98202bc764c4 Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Wed, 10 Nov 2010 09:49:03 -0800
Subject: [PATCH] add more logs when taking heartbeat, and make ha enabled even
 in oss

---
 .../computing/LibvirtComputingResource.java   | 50 ++++++++-----------
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh     |  2 +
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index 67a21bb198d..e997cae9dc2 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -235,7 +235,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     private String _dcId;
     private String _pod;
     private String _clusterId;
-    private String _premium;
     private long _hvVersion;
     private KVMHAMonitor _monitor;
     private final String _SSHKEYSPATH = "/root/.ssh";
@@ -735,17 +734,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 			
 		}
 		
-		_premium = (String)params.get("premium");
-		if (_premium == null) {
-			_premium = "false";
-		}
-		
-		if (_premium.equalsIgnoreCase("true")) {
-			String[] info = NetUtils.getNetworkParams(_privateNic);
-			_monitor = new KVMHAMonitor(null, _conn, info[0], _heartBeatPath);
-			Thread ha = new Thread(_monitor);
-			ha.start();
-		}
+
+		String[] info = NetUtils.getNetworkParams(_privateNic);
+		_monitor = new KVMHAMonitor(null, _conn, info[0], _heartBeatPath);
+		Thread ha = new Thread(_monitor);
+		ha.start();
+
 		
 		 try {
              Class<?> clazz = Class.forName("com.cloud.storage.JavaStorageLayer");
@@ -1252,14 +1246,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 			pool.destroy();
 			pool.undefine();
 			
-			if (_premium.equalsIgnoreCase("true")) {
-				KVMHABase.NfsStoragePool sp = new KVMHABase.NfsStoragePool(cmd.getPool().getUuid(),
-						cmd.getPool().getHostAddress(),
-						cmd.getPool().getPath(),
-						_mountPoint + File.separator + cmd.getPool().getUuid(),
-						PoolType.PrimaryStorage);
-				_monitor.removeStoragePool(sp);
-			}
+
+			KVMHABase.NfsStoragePool sp = new KVMHABase.NfsStoragePool(cmd.getPool().getUuid(),
+					cmd.getPool().getHostAddress(),
+					cmd.getPool().getPath(),
+					_mountPoint + File.separator + cmd.getPool().getUuid(),
+					PoolType.PrimaryStorage);
+			_monitor.removeStoragePool(sp);
+			
 			
 			return new Answer(cmd);
 		} catch (LibvirtException e) {
@@ -1903,14 +1897,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
                                                                      spi.capacity,
                                                                      spi.allocation,
                                                                      tInfo);
-        if (_premium.equalsIgnoreCase("true")) {
-        	KVMHABase.NfsStoragePool pool = new KVMHABase.NfsStoragePool(cmd.getPool().getUuid(),
-        			cmd.getPool().getHostAddress(),
-        			cmd.getPool().getPath(),
-        			_mountPoint + File.separator + cmd.getPool().getUuid(),
-        			PoolType.PrimaryStorage);
-        	_monitor.addStoragePool(pool);
-        }
+       
+        KVMHABase.NfsStoragePool pool = new KVMHABase.NfsStoragePool(cmd.getPool().getUuid(),
+        		cmd.getPool().getHostAddress(),
+        		cmd.getPool().getPath(),
+        		_mountPoint + File.separator + cmd.getPool().getUuid(),
+        		PoolType.PrimaryStorage);
+        _monitor.addStoragePool(pool);
+       
         try {
         	storagePool.free();
         } catch (LibvirtException e) {
diff --git a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
index 02738405d76..88a25b772c8 100755
--- a/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
+++ b/scripts/vm/hypervisor/kvm/kvmheartbeat.sh
@@ -77,6 +77,7 @@ then
    mount $NfsSvrIP:$NfsSvrPath $MountPoint -o sync,soft,proto=tcp,acregmin=0,acregmax=0,acdirmin=0,acdirmax=0,noac,timeo=133,retrans=10 &> /dev/null
    if [ $? -gt 0 ]
    then
+      printf "Failed to remount $NfsSvrIP:$NfsSvrPath under $MountPoint" 
       exit 1
    fi
    if [ "$rflag" == "0" ]
@@ -98,6 +99,7 @@ write_hbLog() {
      touch $hbFile &> /dev/null
      if [ $? -gt 0 ]
      then
+ 	printf "Failed to create $hbFile"
         return 2
      fi
   fi