Merge branch 'bug/remove-container' into 'master'

remove container from etcd only if container is successfully removed See merge request !79
projecteru2 · Apr 11, 2017 · e5356e4 · e5356e4
2 parents 2897f2f + 141623e
commit e5356e4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/cluster/calcium/remove_container.go b/cluster/calcium/remove_container.go
@@ -143,9 +143,7 @@ func (c *calcium) removeOneContainer(container *types.Container, info enginetype
 				return
 			}
 		}
-		//TODO 记录操作日志
 		c.store.UpdateNodeMem(node.Podname, node.Name, container.Memory, "+")
-		c.store.RemoveContainer(info.ID)
 	}()
 
 	// before stop
@@ -169,5 +167,6 @@ func (c *calcium) removeOneContainer(container *types.Container, info enginetype
 		log.Errorf("Error during ContainerRemove: %s", err.Error())
 		return err
 	}
+	c.store.RemoveContainer(info.ID)
 	return nil
 }