From f91d85337ed0d9348f2a13e5a94142749df5faf0 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 22 Mar 2019 22:54:30 +0800 Subject: [PATCH] fix: aws sync metadata ignoring errors --- pkg/util/aws/instance.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/util/aws/instance.go b/pkg/util/aws/instance.go index 5b20e7f774..b1572d7854 100644 --- a/pkg/util/aws/instance.go +++ b/pkg/util/aws/instance.go @@ -163,18 +163,20 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict { tags, err := FetchTags(self.host.zone.region.ec2Client, self.InstanceId) if err != nil { log.Errorf(err.Error()) + } else { + data.Update(tags) } - data.Update(tags) data.Add(jsonutils.NewString(self.host.zone.GetGlobalId()), "zone_ext_id") if len(self.ImageId) > 0 { image, err := self.host.zone.region.GetImage(self.ImageId) if err != nil { log.Errorf("Failed to find image %s for instance %s zone %s", self.ImageId, self.GetId(), self.ZoneId) - } - meta := image.GetMetadata() - if meta != nil { - data.Update(meta) + } else { + meta := image.GetMetadata() + if meta != nil { + data.Update(meta) + } } } secgroupIds := jsonutils.NewArray()