diff options
| -rw-r--r-- | unmaintained/load_test/load_test_leveldb/load_test_leveldb.go (renamed from unmaintained/load_test/load_test_leveldb.go) | 2 | ||||
| -rw-r--r-- | weed/storage/store.go | 18 | ||||
| -rw-r--r-- | weed/storage/volume_read_write.go | 24 |
3 files changed, 13 insertions, 31 deletions
diff --git a/unmaintained/load_test/load_test_leveldb.go b/unmaintained/load_test/load_test_leveldb/load_test_leveldb.go index 3ff01f3eb..518a5081c 100644 --- a/unmaintained/load_test/load_test_leveldb.go +++ b/unmaintained/load_test/load_test_leveldb/load_test_leveldb.go @@ -1,4 +1,4 @@ -package main +package load_test_leveldb import ( "crypto/md5" diff --git a/weed/storage/store.go b/weed/storage/store.go index e99d77774..ac13f6a28 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -217,11 +217,10 @@ func (s *Store) WriteVolumeNeedle(i needle.VolumeId, n *needle.Needle) (size uin err = fmt.Errorf("volume %d is read only", i) return } - // TODO: count needle size ahead - if MaxPossibleVolumeSize >= v.ContentSize()+uint64(size) { + if MaxPossibleVolumeSize >= v.ContentSize()+uint64(needle.GetActualSize(size, v.version)) { _, size, isUnchanged, err = v.writeNeedle(n) } else { - err = fmt.Errorf("Volume Size Limit %d Exceeded! Current size is %d", s.GetVolumeSizeLimit(), v.ContentSize()) + err = fmt.Errorf("volume size limit %d exceeded! current size is %d", s.GetVolumeSizeLimit(), v.ContentSize()) } return } @@ -231,10 +230,17 @@ func (s *Store) WriteVolumeNeedle(i needle.VolumeId, n *needle.Needle) (size uin } func (s *Store) DeleteVolumeNeedle(i needle.VolumeId, n *needle.Needle) (uint32, error) { - if v := s.findVolume(i); v != nil && !v.readOnly { - return v.deleteNeedle(n) + if v := s.findVolume(i); v != nil { + if v.readOnly { + return 0, fmt.Errorf("volume %d is read only", i) + } + if MaxPossibleVolumeSize >= v.ContentSize()+uint64(needle.GetActualSize(0, v.version)) { + return v.deleteNeedle(n) + } else { + return 0, fmt.Errorf("volume size limit %d exceeded! current size is %d", s.GetVolumeSizeLimit(), v.ContentSize()) + } } - return 0, nil + return 0, fmt.Errorf("volume %d not found on %s:%d", i, s.Ip, s.Port) } func (s *Store) ReadVolumeNeedle(i needle.VolumeId, n *needle.Needle) (int, error) { diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go index 0327e5a1f..d080e5dba 100644 --- a/weed/storage/volume_read_write.go +++ b/weed/storage/volume_read_write.go @@ -53,30 +53,6 @@ func (v *Volume) Destroy() (err error) { return } -// AppendBlob append a blob to end of the data file, used in replication -func (v *Volume) AppendBlob(b []byte) (offset int64, err error) { - if v.readOnly { - err = fmt.Errorf("%s is read-only", v.dataFile.Name()) - return - } - v.dataFileAccessLock.Lock() - defer v.dataFileAccessLock.Unlock() - if offset, err = v.dataFile.Seek(0, 2); err != nil { - glog.V(0).Infof("failed to seek the end of file: %v", err) - return - } - //ensure file writing starting from aligned positions - if offset%NeedlePaddingSize != 0 { - offset = offset + (NeedlePaddingSize - offset%NeedlePaddingSize) - if offset, err = v.dataFile.Seek(offset, 0); err != nil { - glog.V(0).Infof("failed to align in datafile %s: %v", v.dataFile.Name(), err) - return - } - } - _, err = v.dataFile.Write(b) - return -} - func (v *Volume) writeNeedle(n *needle.Needle) (offset uint64, size uint32, isUnchanged bool, err error) { glog.V(4).Infof("writing needle %s", needle.NewFileIdFromNeedle(v.Id, n).String()) if v.readOnly { |