UPSTREAM: <drop>: make RootFsInfo error non-fatal on start
@@ -541,11 +541,12 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
rootfs, err := cm.cadvisorInterface.RootFsInfo()
if err != nil {
- return fmt.Errorf("failed to get rootfs info: %v", err)
- }
+ glog.Errorf("failed to get rootfs info, cannot set ephemeral storage capacity: %v", err)
+ } else {
for rName, rCap := range cadvisor.EphemeralStorageCapacityFromFsInfo(rootfs) {
cm.capacity[rName] = rCap
}
+ }
// Ensure that node allocatable configuration is valid.
if err := cm.validateNodeAllocatable(); err != nil {
