From d33757fbbb19ab2c09e82363a12b62094972ee1c Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Mon, 20 Aug 2018 15:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CPU=E3=80=81=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E5=8F=98=E6=9B=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/compute/guestdrivers/aliyun.go | 11 ++++++-----
 pkg/util/aliyun/instance.go        |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go
index d7489da423..7baad16137 100644
--- a/pkg/compute/guestdrivers/aliyun.go
+++ b/pkg/compute/guestdrivers/aliyun.go
@@ -342,7 +342,6 @@ func (self *SAliyunGuestDriver) RequestChangeVmConfig(ctx context.Context, guest
 	config.InstanceId = guest.GetExternalId()
 	config.Cpu = int(vcpuCount)
 	config.Memory = int(vmemSize)
-	// taskman localTaskRun
 	ihost, err := guest.GetHost().GetIHost()
 	if err != nil {
 		return err
@@ -353,11 +352,13 @@ func (self *SAliyunGuestDriver) RequestChangeVmConfig(ctx context.Context, guest
 		return err
 	}
 
-	err = iVM.ChangeConfig(config.InstanceId, config.Cpu, config.Memory)
-	// todo: wait status ready & check disk
-	if err != nil {
-		return err
+	if int(guest.VcpuCount) != config.Cpu || guest.VmemSize != config.Memory {
+		err = iVM.ChangeConfig(config.InstanceId, config.Cpu, config.Memory)
+		if err != nil {
+			return err
+		}
 	}
+
 	log.Debugf("VMchangeConfig %s, wait status ready ...", iVM.GetGlobalId())
 	err = cloudprovider.WaitStatus(iVM, models.VM_READY, time.Second*5, time.Second*300)
 	if err != nil {
diff --git a/pkg/util/aliyun/instance.go b/pkg/util/aliyun/instance.go
index 9bf836a180..e74189be1c 100644
--- a/pkg/util/aliyun/instance.go
+++ b/pkg/util/aliyun/instance.go
@@ -583,7 +583,6 @@ func (self *SRegion) DeployVM(instanceId string, name string, password string, k
 	}
 
 	if len(params) > 0 {
-		log.Debugf("DeployVM with params %s", params)
 		return self.modifyInstanceAttribute(instanceId, params)
 	} else {
 		return nil