Merge branch 'master' into support_ssd_volume

This commit is contained in:
Chris Lu
2020-12-17 22:30:19 -08:00
2 changed files with 32 additions and 11 deletions

View File

@@ -267,12 +267,12 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
location.volumesLock.Lock()
for _, vid := range deleteVids {
found, err := location.deleteVolumeById(vid)
if found {
if err == nil {
if err == nil {
if found {
glog.V(0).Infof("volume %d is deleted", vid)
} else {
glog.V(0).Infof("delete volume %d: %v", vid, err)
}
} else {
glog.V(0).Infof("delete volume %d: %v", vid, err)
}
}
location.volumesLock.Unlock()