Merge pull request #2020 from aaronlehmann/update-unallocated-items

allocator: Update unallocatedServices properly after service updates
moby · Mar 9, 2017 · a2d9b0b · a2d9b0b
2 parents 54cfa17 + 92e74a2
commit a2d9b0b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/manager/allocator/network.go b/manager/allocator/network.go
@@ -402,6 +402,9 @@ func (a *Allocator) doNetworkAlloc(ctx context.Context, ev events.Event) {
 			return a.commitAllocatedService(ctx, batch, s)
 		}); err != nil {
 			log.G(ctx).WithError(err).Errorf("Failed to commit allocation during update for service %s", s.ID)
+			nc.unallocatedServices[s.ID] = s
+		} else {
+			delete(nc.unallocatedServices, s.ID)
 		}
 	case state.EventDeleteService:
 		s := v.Service.Copy()