vpcagent: work around nics of pending deleted guest

yunionio · Apr 27, 2020 · 1183588 · 1183588
1 parent 5fdf202
commit 1183588
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go
@@ -211,19 +211,19 @@ func (set Guestnetworks) Copy() apihelper.IModelSet {
 }
 
 func (set Guestnetworks) joinGuests(subEntries Guests) bool {
-	correct := true
 	for _, gn := range set {
 		gId := gn.GuestId
 		g, ok := subEntries[gId]
 		if !ok {
 			if gn.Network != nil && gn.Network.Vpc != nil {
-				log.Warningf("guestnetwork %d(net:%s,ip:%s) guest id %s not found",
-					gn.RowId, gn.NetworkId, gn.IpAddr, gId)
-				correct = false
+				// Only log info instead of error because the
+				// guest could be in pending_deleted state
+				log.Infof("guestnetwork (net:%s,ip:%s) guest id %s not found",
+					gn.NetworkId, gn.IpAddr, gId)
 			}
 			continue
 		}
 		gn.Guest = g
 	}
-	return correct
+	return true
 }
diff --git a/pkg/vpcagent/ovn/worker.go b/pkg/vpcagent/ovn/worker.go
@@ -114,6 +114,9 @@ func (w *Worker) run(ctx context.Context, mss *agentmodels.ModelSets) (err error
 		for _, network := range vpc.Networks {
 			ovndb.ClaimNetwork(ctx, network)
 			for _, guestnetwork := range network.Guestnetworks {
+				if guestnetwork.Guest == nil {
+					continue
+				}
 				var (
 					guest   = guestnetwork.Guest
 					network = guestnetwork.Network