Skip to content

Delete vmdk first before delete directory for vc 6.5 or newer #2652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emlin merged 6 commits into from
Oct 18, 2016
Merged

Delete vmdk first before delete directory for vc 6.5 or newer #2652

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43be2bb
Delete vmdk first before delete directory for vc 6.5 or newer
emlin Oct 11, 2016
088dc5e
Recursively delete datastore files
emlin Oct 13, 2016
93468b4
Merge branch 'master' into 2014
emlin Oct 17, 2016
37fb4e2
Merge branch 'master' into 2014
emlin Oct 18, 2016
4872b32
Merge branch 'master' into 2014
emlin Oct 18, 2016
b23b91f
Merge branch 'master' into 2014
emlin Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions lib/install/management/store_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ func (d *Dispatcher) deleteImages(conf *config.VirtualContainerHostConfigSpec) e
defer trace.End(trace.Begin(""))
var errs []string

log.Infoln("Removing image stores")

for _, imageDir := range conf.ImageStores {
imageDSes, err := d.session.Finder.DatastoreList(d.ctx, imageDir.Host)
if err != nil {
Expand Down Expand Up @@ -137,14 +139,7 @@ func (d *Dispatcher) deleteDatastoreFiles(ds *object.Datastore, path string, for
}

m := object.NewFileManager(ds.Client())
if d.isVSAN(ds) {
if err = d.deleteFilesIteratively(m, ds, dsPath); err != nil {
return empty, err
}
return true, nil
}

if err = d.deleteVMFSFiles(m, ds, dsPath); err != nil {
if err = d.deleteFilesIteratively(m, ds, dsPath); err != nil {
return empty, err
}
return true, nil
Expand Down Expand Up @@ -311,7 +306,7 @@ func (d *Dispatcher) deleteVolumeStoreIfForced(conf *config.VirtualContainerHost
return 0
}

log.Infoln("Removing volume stores...")
log.Infoln("Removing volume stores")
for label, url := range conf.VolumeLocations {
// FIXME: url is being encoded by the portlayer incorrectly, so we have to convert url.Path to the right url.URL object
dsURL, err := datastore.ToURL(url.Path)
Expand Down