From 01b8c046fde6d1ae80da8deeb9f9c32217951308 Mon Sep 17 00:00:00 2001 From: ioito Date: Thu, 18 Apr 2019 15:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=80=E4=BA=9B=E5=85=AC?= =?UTF-8?q?=E6=9C=89=E4=BA=91=E9=87=8D=E8=A3=85=E7=B3=BB=E7=BB=9F=E5=90=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=88=B7=E6=96=B0=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/guestdrivers/managedvirtual.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index 6c5a9fac5b..9b1e9e0d4a 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -368,12 +368,15 @@ func (self *SManagedVirtualizedGuestDriver) RemoteDeployGuestForRebuildRoot(ctx time.Sleep(time.Second * 5) waited += 5 } else { - if idisks[0].GetGlobalId() != diskId { - log.Errorf("system disk id inconsistent %s != %s", idisks[0].GetGlobalId(), diskId) + if idisks[0].GetGlobalId() == diskId { + break + } + if waited > maxWaitSecs { return nil, fmt.Errorf("inconsistent sys disk id after rebuild root") } - - break + log.Debugf("current system disk id inconsistent %s != %s, try after 5 seconds", idisks[0].GetGlobalId(), diskId) + time.Sleep(time.Second * 5) + waited += 5 } }