opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit '6ec91d6f4dd6ebf539369987fd829738bb6c0cbf':
  识别新版vmdk
This commit is contained in:
邱剑
2019-02-19 17:34:30 +08:00
parent 4af23de378 6ec91d6f4d
commit fb4592a4fa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/vmdkutils/vmdkutils.go
+4 -2
View File
@@ -24,7 +24,9 @@ type SVMDKInfo struct {
}
const (
extentPatternString = `^RW \d+ VMFS\w* \"(?P<fn>[^"]+)`
//RW 20971520 VMFS "89334fec-7013-46cb-8d7b-8271cbe1a175_1-flat.vmdk"
//RW 62914560 SESPARSE "89334fec-7013-46cb-8d7b-8271cbe1a175-sesparse.vmdk"
extentPatternString = `^RW \d+ (VMFS|SESPARSE)\w* \"(?P<fn>[^"]+)`
)
var (
@@ -44,7 +46,7 @@ func ParseStream(stream io.Reader) (*SVMDKInfo, error) {
matches := extentPatternRegexp.FindStringSubmatch(line)
if len(matches) > 0 {
// log.Debugf("%#v", matches)
info.ExtentFile = matches[1]
info.ExtentFile = matches[2]
findExtent = true
} else {
equalPos := strings.IndexByte(line, '=')