bugfix: fix some cold volume bug

1. remove ebs-access path check 2. update datapartition after opening a cold file 3. cold files use TinyExtent when offset + size <= 1M Signed-off-by: lixiang12407 <[email protected]>
pengzhouhu · Apr 13, 2022 · 8782656 · 8782656
1 parent 4d74bcb
commit 8782656
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/client/fuse.go b/client/fuse.go
@@ -780,11 +780,5 @@ func loadConfFromMaster(opt *proto.MountOptions) (err error) {
 	}
 	opt.EbsEndpoint = clusterInfo.EbsAddr
 	opt.EbsServicePath = clusterInfo.ServicePath
-	if proto.IsCold(opt.VolType) {
-		if opt.EbsBlockSize == 0 || opt.EbsEndpoint == "" || opt.EbsServicePath == "" {
-			return errors.New("cold volume ebs config is empty.")
-		}
-		log.LogDebugf("ebs config: EbsEndpoint(%v) EbsServicePath(%v) EbsBlockSize(%v)", opt.EbsEndpoint, opt.EbsServicePath, opt.EbsBlockSize)
-	}
 	return
 }
diff --git a/sdk/data/blobstore/reader.go b/sdk/data/blobstore/reader.go
@@ -118,6 +118,10 @@ func NewReader(config ClientConfig) (reader *Reader) {
 	reader.fileCache = config.FileCache
 	reader.cacheThreshold = config.CacheThreshold
 
+	if proto.IsCold(reader.volType) {
+		reader.ec.UpdateDataPartitionForColdVolume()
+	}
+
 	return
 }
 

diff --git a/sdk/data/stream/extent_client.go b/sdk/data/stream/extent_client.go
@@ -468,3 +468,7 @@ func (client *ExtentClient) GetDataPartitionForWrite() error {
 	_, err := client.dataWrapper.GetDataPartitionForWrite(exclude)
 	return err
 }
+
+func (client *ExtentClient) UpdateDataPartitionForColdVolume() error {
+	return client.dataWrapper.UpdateDataPartition()
+}
diff --git a/sdk/data/stream/stream_writer.go b/sdk/data/stream/stream_writer.go
@@ -408,12 +408,20 @@ func (s *Streamer) doWrite(data []byte, offset, size int, direct bool) (total in
 		storeMode int
 	)
 
-	// Small files are usually written in a single write, so use tiny extent
-	// store only for the first write operation.
-	if offset > 0 {
-		storeMode = proto.NormalExtentType
+	if proto.IsCold(s.client.volumeType) {
+		if offset + size > s.tinySizeLimit() {
+			storeMode = proto.NormalExtentType
+		} else {
+			storeMode = proto.TinyExtentType
+		}
 	} else {
-		storeMode = proto.TinyExtentType
+		// Small files are usually written in a single write, so use tiny extent
+		// store only for the first write operation.
+		if offset > 0 {
+			storeMode = proto.NormalExtentType
+		} else {
+			storeMode = proto.TinyExtentType
+		}
 	}
 
 	log.LogDebugf("doWrite enter: ino(%v) offset(%v) size(%v) storeMode(%v)", s.inode, offset, size, storeMode)

diff --git a/sdk/data/wrapper/wrapper.go b/sdk/data/wrapper/wrapper.go
@@ -227,6 +227,10 @@ func (w *Wrapper) updateDataPartition(isInit bool) (err error) {
 	return w.updateDataPartitionByRsp(isInit, dpv.DataPartitions)
 }
 
+func (w *Wrapper) UpdateDataPartition() (err error) {
+	return w.updateDataPartition(false)
+}
+
 // getDataPartition will call master to get data partition info which not include in  cache updated by
 // updateDataPartition which may not take effect if nginx be placed for reduce the pressure of master
 func (w *Wrapper) getDataPartition(isInit bool, dpId uint64) (err error) {