From 79d9f5007bc8e29c85ca957ec4c6b6ae2bfe3124 Mon Sep 17 00:00:00 2001 From: ioito Date: Sat, 20 Apr 2019 21:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8EINSTANCE=5FSTATUS=5F?= =?UTF-8?q?VERIFY=5FRESIZE=E4=B8=8EINSTANCE=5FSTATUS=5FRESIZE=E7=8A=B6?= =?UTF-8?q?=E4=B8=80=E6=A0=B7,=E5=AF=BC=E8=87=B4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9C=AA=E5=88=B0INSTANCE=5FSTATUS=5FVERIFY=5FRESIZE=E6=97=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=A1=AE=E8=AE=A4=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/openstack/instance.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/util/openstack/instance.go b/pkg/util/openstack/instance.go index 56eb4cc26b..036b660ec8 100644 --- a/pkg/util/openstack/instance.go +++ b/pkg/util/openstack/instance.go @@ -328,8 +328,10 @@ func (instance *SInstance) GetStatus() string { case INSTANCE_STATUS_RESIZE: return api.VM_CHANGE_FLAVOR case INSTANCE_STATUS_VERIFY_RESIZE: - // API请求更改配置后，会有一个确认的状态，即此状态 - return api.VM_CHANGE_FLAVOR + // API请求更改配置后，状态先回变更到 INSTANCE_STATUS_RESIZE 等待一会变成此状态 + // 到达此状态后需要再次发送确认请求，变更才会生效 + // 此状态不能和INSTANCE_STATUS_RESIZE返回一样，避免在INSTANCE_STATUS_RESIZE状态下发送确认请求，导致更改配置失败 + return api.VM_SYNC_CONFIG case INSTANCE_STATUS_SHELVED, INSTANCE_STATUS_SHELVED_OFFLOADED, INSTANCE_STATUS_SHUTOFF, INSTANCE_STATUS_SOFT_DELETED: return api.VM_READY default: @@ -448,7 +450,7 @@ func (region *SRegion) ChangeConfig(instance *SInstance, flavorId string) error if err != nil { return err } - if err := cloudprovider.WaitStatus(instance, api.VM_CHANGE_FLAVOR, time.Second*3, time.Minute*4); err != nil { + if err := cloudprovider.WaitStatus(instance, api.VM_SYNC_CONFIG, time.Second*3, time.Minute*4); err != nil { return err } return region.instanceOperation(instance.ID, "confirmResize")