0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rather than remove the swarm directory and re-create, remove the swarm subdirs

Browse source 
Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2017-02-22 13:26:41 -08:00
parent bb9f19503c
commit 68506bd239
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/cluster/utils.go
View file

@ -38,12 +38,19 @@ func savePersistentState(root string, config nodeStartConfig) error {
func clearPersistentState(root string) error {
// todo: backup this data instead of removing?
if err := os.RemoveAll(root); err != nil {
// rather than delete the entire swarm directory, delete the contents in order to preserve the inode
// (for example, allowing it to be bind-mounted)
files, err := ioutil.ReadDir(root)
if err != nil {
return err
}
if err := os.MkdirAll(root, 0700); err != nil {
return err
for _, f := range files {
if err := os.RemoveAll(filepath.Join(root, f.Name())); err != nil {
return err
}
}
return nil
}