volume: avoid compacting wait group

weed/storage/volume.go

@@ -22,7 +22,6 @@ type Volume struct {
 	Collection    string
 	dataFile      *os.File
 	nm            NeedleMapper
-	compactingWg  sync.WaitGroup
 	needleMapKind NeedleMapType
 	readOnly      bool
 

weed/storage/volume_read_write.go

@@ -135,13 +135,9 @@ func (v *Volume) deleteNeedle(n *needle.Needle) (uint32, error) {
 // read fills in Needle content by looking up n.Id from NeedleMapper
 func (v *Volume) readNeedle(n *needle.Needle) (int, error) {
 	nv, ok := v.nm.Get(n.Id)
-	if !ok || nv.Offset.IsZero() {
-		v.compactingWg.Wait()
-		nv, ok = v.nm.Get(n.Id)
 	if !ok || nv.Offset.IsZero() {
 		return -1, ErrorNotFound
 	}
-	}
 	if nv.Size == TombstoneFileSize {
 		return -1, errors.New("already deleted")
 	}

weed/storage/volume_vacuum.go

@@ -46,8 +46,6 @@ func (v *Volume) CommitCompact() error {
 	v.dataFileAccessLock.Lock()
 	defer v.dataFileAccessLock.Unlock()
 	glog.V(3).Infof("Got volume %d committing lock...", v.Id)
-	v.compactingWg.Add(1)
-	defer v.compactingWg.Done()
 	v.nm.Close()
 	if err := v.dataFile.Close(); err != nil {
 		glog.V(0).Infof("fail to close volume %d", v.Id)