Merge branch 'master' of https://github.com/chrislusf/seaweedfs

2 files changed, 12 insertions, 0 deletions

diff --git a/weed/storage/store_vacuum.go b/weed/storage/store_vacuum.go
index 0d6e0b0f1..cbd716b32 100644
--- a/weed/storage/store_vacuum.go
+++ b/weed/storage/store_vacuum.go
@@ -26,6 +26,9 @@ func (s *Store) CompactVolume(vid needle.VolumeId, preallocate int64, compaction
 	return fmt.Errorf("volume id %d is not found during compact", vid)
 }
 func (s *Store) CommitCompactVolume(vid needle.VolumeId) (bool, error) {
+	if s.isStopping {
+		return false, fmt.Errorf("volume id %d skips compact because volume is stopping", vid)
+	}
 	if v := s.findVolume(vid); v != nil {
 		return v.IsReadOnly(), v.CommitCompact()
 	}
diff --git a/weed/storage/volume_vacuum.go b/weed/storage/volume_vacuum.go
index d686e2b09..56e8beddb 100644
--- a/weed/storage/volume_vacuum.go
+++ b/weed/storage/volume_vacuum.go
@@ -289,6 +289,9 @@ func (v *Volume) makeupDiff(newDatFileName, newIdxFileName, oldDatFileName, oldI
 				return fmt.Errorf("ReadNeedleBlob %s key %d offset %d size %d failed: %v", oldDatFile.Name(), key, increIdxEntry.offset.ToActualOffset(), increIdxEntry.size, err)
 			}
 			dstDatBackend.Write(needleBytes)
+			if err := dstDatBackend.Sync(); err != nil {
+				return fmt.Errorf("cannot sync needle %s: %v", dstDatBackend.File.Name(), err)
+			}
 			util.Uint32toBytes(idxEntryBytes[8:12], uint32(offset/NeedlePaddingSize))
 		} else { //deleted needle
 			//fakeDelNeedle 's default Data field is nil
@@ -308,6 +311,12 @@ func (v *Volume) makeupDiff(newDatFileName, newIdxFileName, oldDatFileName, oldI
 				newIdxFileName, err)
 		}
 		_, err = idx.Write(idxEntryBytes)
+		if err != nil {
+			return fmt.Errorf("cannot write indexfile %s: %v", newIdxFileName, err)
+		}
+		if err := idx.Sync(); err != nil {
+			return fmt.Errorf("cannot sync indexfile %s: %v", newIdxFileName, err)
+		}
 	}
 
 	return nil