Merge pull request #166 from ashish-amarnath/fix-snap-import

k8s-ci-robot · web-flow · commit df131a625eff · 2020-03-13T10:04:40.000-07:00
Fix snapshot importing
diff --git a/pkg/hostpath/hostpath.go b/pkg/hostpath/hostpath.go
@@ -151,10 +151,10 @@ func discoverExistingSnapshots() {
 	for _, file := range files {
 		isSnapshot, snapshotID := getSnapshotID(file.Name())
 		if isSnapshot {
-			glog.V(4).Infof("adding snapshot %s from file %s", snapshotID, file.Name())
+			glog.V(4).Infof("adding snapshot %s from file %s", snapshotID, getSnapshotPath(snapshotID))
 			hostPathVolumeSnapshots[snapshotID] = hostPathSnapshot{
 				Id:         snapshotID,
-				Path:       file.Name(),
+				Path:       getSnapshotPath(snapshotID),
 				ReadyToUse: true,
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,10 @@ func discoverExistingSnapshots() {`
`151`	`151`	`for _, file := range files {`
`152`	`152`	`isSnapshot, snapshotID := getSnapshotID(file.Name())`
`153`	`153`	`if isSnapshot {`
`154`		`- glog.V(4).Infof("adding snapshot %s from file %s", snapshotID, file.Name())`
	`154`	`+ glog.V(4).Infof("adding snapshot %s from file %s", snapshotID, getSnapshotPath(snapshotID))`
`155`	`155`	`hostPathVolumeSnapshots[snapshotID] = hostPathSnapshot{`
`156`	`156`	`Id: snapshotID,`
`157`		`- Path: file.Name(),`
	`157`	`+ Path: getSnapshotPath(snapshotID),`
`158`	`158`	`ReadyToUse: true,`
`159`	`159`	`}`
`160`	`160`	`}`